Merge branch 'develop' into support-nullable-configurations

Author: jxltom

.github/workflows/build.yml

@@ -27,12 +27,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/[email protected]
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |
@@ -67,12 +67,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/[email protected]
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Install in dev mode
         run: python -m pip install -e .

.github/workflows/ci.yml

@@ -51,13 +51,13 @@ jobs:
           - '3.7'
           - '3.8'
           - '3.9'
-          - '3.10.0-beta - 3.10'
+          - '3.10'
           - 'pypy-3.7'
         os: [ ubuntu-latest, macos-latest, windows-latest ]
 
     steps:
       - name: Checkout code
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           fetch-depth: 5
 

.github/workflows/cs.yml

@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/[email protected]
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |

.github/workflows/docs.yml

@@ -21,17 +21,30 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.10
         uses: actions/[email protected]
         with:
-          python-version: '3.8'
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install tox tox-gh-actions
 
+      - name: Check external links in the package documentation
+        run: tox -e linkcheck
+
       - name: Build and test package documentation
         run: tox -e docs
+
+      - name: Archive docs artifacts
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: docs
+          path: docs
+          # Artifacts are retained for 90 days by default.
+          # In fact, we don't need such long period.
+          retention-days: 60

.readthedocs.yml

@@ -6,13 +6,20 @@
 # For the full copyright and license information, please view
 # the LICENSE.txt file that was distributed with this source code.
 
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
 ---
 version: 2
-python:
-  # Keep version in sync with tox.ini (testenv:docs) and
-  # docs.yml (GitHub Action Workflow).
-  version: '3.8'
 
+build:
+  os: ubuntu-20.04
+  tools:
+    # Keep version in sync with tox.ini (testenv:docs) and
+    # docs.yml (GitHub Action Workflow).
+    python: '3.10'
+
+python:
   install:
     - method: pip
       path: .

AUTHORS.rst

@@ -6,6 +6,9 @@ and currently maintained by `Serghei Iakovlev <https://github.com/sergeyklay/>`_
 
 A full list of contributors can be found in `GitHub <https://github.com/joke2k/django-environ/graphs/contributors>`__.
 
+Acknowledgments
+===============
+
 The existence of ``django-environ`` would have been impossible without these
 projects:
 

BACKERS.rst

@@ -9,9 +9,9 @@ Sponsors
 --------
 
 Support this project by becoming a sponsor. Your logo will show up here with a
-link to your website. `Became sponsor <https://opencollective.com/django-environ#sponsor>`_.
+link to your website. `Became sponsor <https://opencollective.com/django-environ/contribute/sponsors-3474/checkout>`_.
 
-|ocsponsor0| |ocsponsor1| |ocsponsor2|
+|ocsponsor0| |ocsponsor1|
 
 Backers
 -------
@@ -21,14 +21,11 @@ Thank you to all our backers!
 |ocbackerimage|
 
 .. |ocsponsor0| image:: https://opencollective.com/django-environ/sponsor/0/avatar.svg
-    :target: https://opencollective.com/django-environ/sponsor/0/website
-    :alt: Sponsor
-.. |ocsponsor1| image:: https://opencollective.com/django-environ/sponsor/1/avatar.svg
-    :target: https://opencollective.com/django-environ/sponsor/1/website
-    :alt: Sponsor
-.. |ocsponsor2| image:: https://opencollective.com/django-environ/sponsor/2/avatar.svg
-    :target: https://opencollective.com/django-environ/sponsor/2/website
+    :target: https://triplebyte.com/
     :alt: Sponsor
+.. |ocsponsor1| image:: https://images.opencollective.com/static/images/become_sponsor.svg
+    :target: https://opencollective.com/django-environ/contribute/sponsors-3474/checkout
+    :alt: Become a Sponsor
 .. |ocbackerimage| image:: https://opencollective.com/django-environ/backers.svg?width=890
     :target: https://opencollective.com/django-environ
     :alt: Backers on Open Collective