Merge branch 'master' into master

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,22 @@
+name: Bug Report
+description: Create a report to help us improve.
+labels: ["bug"]
+body:
+    - type: textarea
+      attributes:
+          label: Current Situation
+          description: Discuss what the current issue is, how to reproduce, and link to any relevant prior discussion/context.
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Proposed Actions
+          description: Describe what ought to be done, and why that will address the reasons for action mentioned above.
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: System Information
+          description: Versions for things such as... Django-dbbackup, Python, Django, Operating System, etc.
+      validations:
+          required: false

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,16 @@
+name: Feature request
+description: Suggest an idea for this project.
+labels: ["feature-request"]
+body:
+    - type: textarea
+      attributes:
+          label: Feature description
+          description: Describe what the feature is, why it is needed, and link any relevant prior discussion/context.
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Alternatives options
+          description: Describe any alternatives to this feature, and why they were not chosen.
+      validations:
+          required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,14 @@
-# Type of PR (feature, enhancement, bug fix, etc.)
-
 ## Description
 
-Please include a summary of the change and which issue is fixed.
-
-Fixes # (issue)
+<!-- A summary of the changes. -->
 
-## Why should this be added
+## Checklist
 
-Explain value.
+Please update this checklist as you complete each item:
 
-## Checklist
+-   [ ] Tests have been developed for bug fixes or new functionality.
+-   [ ] The changelog has been updated, if necessary.
+-   [ ] Documentation has been updated, if necessary.
+-   [ ] GitHub Issues closed by this PR have been linked.
 
-- [ ] Documentation has been added or amended for this feature / update
+<sub>By submitting this pull request I agree that all contributions comply with this project's open source license(s).</sub>

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.7", "3.8", "3.9", "3.10"]
+                python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         steps:
             - uses: actions/checkout@v2
             - name: Set up Python ${{ matrix.python-version }}
@@ -24,7 +24,10 @@ jobs:
                   python -m pip install --upgrade pip
                   python -m pip install -r requirements/tests.txt
                   python -m pip install -r requirements.txt
-            - name: Linting
+            # TODO: Remove this conditional when Python 3.7 is dropped and Flake8 executes on
+            # all Python versions in matrix.
+            - if: matrix.python-version == '3.8'
+              name: Linting
               run: flake8
             # Environments are selected using tox-gh-actions configuration in tox.ini.
             - name: Test with tox

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
       hooks:
           - id: yesqa
     - repo: https://github.com/pycqa/isort
-      rev: "5.10.1"
+      rev: "5.12.0"
       hooks:
           - id: isort
             args: ["--profile", "black"]

dbbackup/VERSION

@@ -1 +1 @@
-4.0.2
+4.1.0

dbbackup/tests/test_storage.py

@@ -23,7 +23,11 @@ def test_set_path(self):
     @patch("dbbackup.settings.STORAGE", DEFAULT_STORAGE_PATH)
     def test_set_options(self, *args):
         storage = get_storage(options=STORAGE_OPTIONS)
-        self.assertEqual(storage.storage.__module__, "django.core.files.storage")
+        self.assertIn(
+            storage.storage.__module__,
+            # TODO: Remove "django.core.files.storage" case when dropping support for Django < 4.2.
+            ("django.core.files.storage", "django.core.files.storage.filesystem"),
+        )
 
 
 class StorageTest(TestCase):

docs/index.rst

@@ -42,7 +42,7 @@ Compatibility
 
 As we want to ensure a lot of platforms will be able to save data before
 upgrading, Django-DBBackup supports PyPy, 3.2 to 3.5 and Django
-greater than 2.2
+greater than 3.2.
 
 Other Resources
 ===============

requirements.txt

@@ -1,2 +1,2 @@
-django>=2.2
+django>=3.2
 pytz

requirements/build.txt

@@ -1,5 +1,5 @@
 build
 setuptools
-tox
+tox>=4.0.0
 twine
 wheel

requirements/tests.txt

@@ -9,5 +9,5 @@ python-dotenv
 python-gnupg>=0.5.0
 pytz
 testfixtures
-tox
+tox>=4.0.0
 tox-gh-actions

setup.py

@@ -48,9 +48,9 @@ def get_test_requirements():
         "Development Status :: 4 - Beta",
         "Environment :: Web Environment",
         "Environment :: Console",
-        "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: BSD License",
@@ -61,6 +61,8 @@ def get_test_requirements():
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Database",
         "Topic :: System :: Archiving",
         "Topic :: System :: Archiving :: Backup",

tox.ini

@@ -1,25 +1,27 @@
 [tox]
-envlist = py{37,38,39}-django22,py{37,38,39,310}-django{32,40,master},lint,docs,functional
+envlist = py{37,38,39,310,311,312}-django{32,42,50,master},lint,docs,functional
 
 [testenv]
 passenv = *
 setenv =
     PYTHONDONTWRITEBYTECODE=1
 deps =
     -rrequirements/tests.txt
-    django22: django>=2.2,<2.3
     django32: django>=3.2,<3.3
-    django40: django>=4.0,<4.1
+    django42: django>=4.2,<4.3
+    django50: django>=5.0,<5.1
     djangomaster: https://github.com/django/django/archive/master.zip
 commands = {posargs:coverage run runtests.py}
 
 # Configure which test environments are run for each Github Actions Python version.
 [gh-actions]
 python =
-    3.7: py37-django{22,32},functional
-    3.8: py38-django{22,32,40},functional
-    3.9: py39-django{22,32,40},functional
-    3.10: py310-django{22,32,40},functional
+    3.7: py37-django{32},functional
+    3.8: py38-django{32,42},functional
+    3.9: py39-django{32,42},functional
+    3.10: py310-django{32,42,50},functional
+    3.11: py311-django{42,50},functional
+    3.12: py312-django{42,50},functional
 
 [testenv:lint]
 basepython = python
@@ -29,14 +31,14 @@ commands = prospector dbbackup -0
 
 [testenv:docs]
 basepython = python
-whitelist_externals=make
+allowlist_externals=make
 deps = -rrequirements/docs.txt
 commands = make docs
 
 [testenv:functional]
 basepython = python
 passenv = *
-whitelist_externals = bash
+allowlist_externals = bash
 deps =
     -rrequirements/tests.txt
     django
@@ -48,7 +50,7 @@ commands = {posargs:bash -x functional.sh}
 [testenv:functional-mongodb]
 basepython = python
 passenv = *
-whitelist_externals = bash
+allowlist_externals = bash
 deps =
     -rrequirements/tests.txt
     djongo