Merge branch 'master' into master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,6 +30,6 @@ If applicable, add screenshots (errors, example of the behavior, etc.) to help e
 
 ### External tools
 
-- Python: [e.g. 3.6]
+- Python: [e.g. 3.7]
 - Django: [e.g. 2.2.0]
 - OS: [Linux, MacOS, Windows]

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+                python-version: ["3.7", "3.8", "3.9", "3.10"]
         steps:
             - uses: actions/checkout@v2
             - name: Set up Python ${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -5,8 +5,7 @@ repos:
       hooks:
           - id: check-merge-conflict
           - id: end-of-file-fixer
-            exclude: >-
-                ^docs/[^/]*\.svg$
+            exclude: ^docs/[^/]*\.svg$
           - id: requirements-txt-fixer
           - id: trailing-whitespace
             types: [python]
@@ -46,7 +45,7 @@ repos:
       rev: "v2.34.0"
       hooks:
           - id: pyupgrade
-            args: ["--py36-plus", "--keep-mock"]
+            args: ["--py37-plus", "--keep-mock"]
     - repo: https://github.com/pre-commit/mirrors-autopep8
       rev: "v1.6.0"
       hooks:
@@ -60,8 +59,7 @@ repos:
       rev: "v1.0.1"
       hooks:
           - id: rst-linter
-            files: >-
-                ^[^/]+[.]rst$
+            files: ^[^/]+[.]rst$
     - repo: https://github.com/adrienverge/yamllint
       rev: "v1.26.3"
       hooks:

.vscode/extensions.json

@@ -2,7 +2,6 @@
     "recommendations": [
         "eamodio.gitlens",
         "github.vscode-pull-request-github",
-        "knisterpeter.vscode-github",
         "esbenp.prettier-vscode",
         "ms-python.vscode-pylance",
         "ms-python.python",

.vscode/settings.json

@@ -6,7 +6,7 @@
     "python.languageServer": "Pylance",
     "python.analysis.typeCheckingMode": "off",
     "python.formatting.provider": "black",
-    "python.sortImports.args": [
+    "isort.args": [
         "--src=${workspaceFolder}"
     ],
     "terminal.integrated.scrollback": 10000,

docs/index.rst

@@ -56,7 +56,7 @@ Other Resources
 
 .. _`GitHub repository`: https://github.com/jazzband/django-dbbackup
 .. _`PyPI project`: https://pypi.python.org/pypi/django-dbbackup/
-.. _`Read The Docs`: http://django-dbbackup.readthedocs.org/
+.. _`Read The Docs`: https://django-dbbackup.readthedocs.org/
 .. _`GitHub issues`: https://github.com/jazzband/django-dbbackup/issues
 .. _`GitHub pull requests`: https://github.com/jazzband/django-dbbackup/pulls
 .. _`Coveralls`: https://coveralls.io/github/jazzband/django-dbbackup

docs/installation.rst

@@ -42,7 +42,7 @@ In your ``settings.py``, make sure you have the following things: ::
 
 Create the backup directory: ::
 
-    mkdir /var/backups
+    mkdir /my/backup/dir/
 
 .. note::
 

docs/storage.rst

@@ -281,15 +281,15 @@ This backend is from Django-Storages with the `paramiko`_ backend. ::
 
     pip install paramiko django-storages
 
-.. _`paramiko`: http://www.paramiko.org/
+.. _`paramiko`: https://www.paramiko.org/
 
 The following configuration grants SSH server access to the local user: ::
 
     DBBACKUP_STORAGE = 'storages.backends.sftpstorage.SFTPStorage'
     DBBACKUP_STORAGE_OPTIONS = {'host': 'myserver'}
 
 
-.. _`paramiko SSHClient.connect() documentation`: http://docs.paramiko.org/en/latest/api/client.html#paramiko.client.SSHClient.connect
+.. _`paramiko SSHClient.connect() documentation`: https://docs.paramiko.org/en/latest/api/client.html#paramiko.client.SSHClient.connect
 
 Available settings
 ~~~~~~~~~~~~~~~~~~

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.black]
-target-version = ['py36']
+target-version = ['py37']
 extend-exclude = 'migrations'
 
 [tool.isort]

setup.py

@@ -27,7 +27,7 @@ def get_test_requirements():
     author="Archmonger",
     author_email="[email protected]",
     long_description=(root_dir / "README.rst").read_text(encoding="utf-8"),
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=get_requirements(),
     tests_require=get_test_requirements(),
     include_package_data=True,
@@ -57,7 +57,6 @@ def get_test_requirements():
         "Natural Language :: English",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38,39}-django22,py{36,37,38,39,310}-django{32,40,master},lint,docs,functional
+envlist = py{37,38,39}-django22,py{37,38,39,310}-django{32,40,master},lint,docs,functional
 
 [testenv]
 passenv = *
@@ -16,7 +16,6 @@ commands = {posargs:coverage run runtests.py}
 # Configure which test environments are run for each Github Actions Python version.
 [gh-actions]
 python =
-    3.6: py36-django{22,32},functional
     3.7: py37-django{22,32},functional
     3.8: py38-django{22,32,40},functional
     3.9: py39-django{22,32,40},functional