Merge pull request #161 from ticosax/maintain-python-versions

Update maintained versions of python and django

.github/workflows/ci.yml

@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Set up Python 3.6
+      - name: Set up Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: "3.6"
+          python-version: "3.10"
       - uses: pre-commit/action@v2.0.2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         experimental: [false]
         toxenv: ["py"]
         include:
@@ -67,7 +67,7 @@ jobs:
     - name: Run tox targets for Python ${{ matrix.python-version }}
       if: ${{ matrix.toxenv == 'PyPy' }}
       continue-on-error: ${{ matrix.experimental }}
-      run: tox -e pypy3-django22,pypy3-django30,pypy3-django31,pypy3-django32
+      run: tox -e pypy3-django22,pypy3-django32
 
     - name: Upload coverage data to coveralls.io
       env:

setup.py

@@ -57,9 +57,9 @@ def get_version(version):
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
 )

tox.ini

@@ -1,10 +1,7 @@
 [tox]
 envlist =
-    py36-django{22,30,31,32},
-    py37-django{22,30,31,32},
-    py38-django{22,30,31,32},
-    py39-django{22,30,31,32},
-    pypy3-django{22,30,31,32},
+    py{37,38,39,310}-django{22,32},
+    py{38,39,310}-django40,
     packaging,
 
 [testenv]
@@ -13,11 +10,11 @@ deps =
     coverage
     djangorestframework
     django22: Django~=2.2
-    django31: Django~=3.1
     django32: Django~=3.2
+    django40: Django~=4.0
 commands =
-    py{36,37,38,39},pypy3: coverage run tests/manage.py test testsuite {posargs: -v 2}
-    py{36,37,38,39},pypy3: coverage report -m
+    py{37,38,39,310},pypy3: coverage run tests/manage.py test testsuite {posargs: -v 2}
+    py{37,38,39,310},pypy3: coverage report -m
 
 [testenv:packaging]
 usedevelop = false