Update version support

Author: David Sanders

.circleci/config.yml

@@ -39,33 +39,33 @@ jobs:
   docs:
     <<: *common
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.8
         environment:
           TOXENV: docs
-  django20:
+  python38-drf310:
     <<: *common
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
         environment:
-          TOXENV: 'py36-django20-drf{38,39}-tests'
-  django21:
+          TOXENV: 'py38-django{22,30}-drf310-tests'
+  python39-drf310:
     <<: *common
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.9
         environment:
-          TOXENV: 'py37-django21-drf{39,310}-tests'
-  django22:
+          TOXENV: 'py39-django{22,30}-drf310-tests'
+  python38-other:
     <<: *common
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.8
         environment:
-          TOXENV: 'py37-django22-drf{39,310,311}-tests'
-  django30:
+          TOXENV: 'py38-django{22,30,31}-drf{311,312}-tests'
+  python39-other:
     <<: *common
     docker:
-      - image: circleci/python:3.8
+      - image: circleci/python:3.9
         environment:
-          TOXENV: 'py38-django30-drf{310,311}-tests'
+          TOXENV: 'py39-django{22,30,31}-drf{311,312}-tests'
   djangomaster:
     working_directory: ~/repo
     steps:
@@ -100,13 +100,13 @@ jobs:
             - ./eggs
           key: v6-cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
     docker:
-      - image: circleci/python:3.8
+      - image: circleci/python:3.9
         environment:
-          TOXENV: 'py38-djangomaster-drf310-tests'
+          TOXENV: 'py39-djangomaster-drf312-tests'
   lint:
     <<: *common
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.8
         environment:
           TOXENV: lint
 
@@ -115,9 +115,9 @@ workflows:
   test:
     jobs:
       - docs
-      - django20
-      - django21
-      - django22
-      - django30
+      - python38-drf310
+      - python39-drf310
+      - python38-other
+      - python39-other
       - djangomaster
       - lint

docs/development_and_contributing.rst

@@ -25,13 +25,11 @@ directory:
 
 .. code-block:: bash
 
+  pyenv install 3.9.x
   pyenv install 3.8.x
-  pyenv install 3.7.x
-  pyenv install 3.6.x
   cat > .python-version <<EOF
+  3.9.x
   3.8.x
-  3.7.x
-  3.6.x
   EOF
 
 Above, the ``x`` in each case should be replaced with the latest corresponding

docs/getting_started.rst

@@ -6,9 +6,9 @@ Getting started
 Requirements
 ------------
 
-* Python (3.6, 3.7, 3.8)
-* Django (2.0, 2.1, 2.2, 3.0)
-* Django REST Framework (3.8, 3.9, 3.10, 3.11)
+* Python (3.8, 3.9)
+* Django (2.2, 3.0, 3.1)
+* Django REST Framework (3.10, 3.11, 3.12)
 
 These are the officially supported python and package versions.  Other versions
 will probably work.  You're free to modify the tox config and see what is

setup.py

@@ -57,7 +57,7 @@
         'djangorestframework',
         'pyjwt',
     ],
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     extras_require=extras_require,
     packages=find_packages(exclude=['tests', 'tests.*', 'licenses', 'requirements']),
     include_package_data=True,

tox.ini

@@ -1,9 +1,8 @@
 [tox]
 envlist=
-    py36-django20-drf{38,39}-tests
-    py37-django21-drf{39,310}-tests
-    py37-django22-drf{39,310,311}-tests
-    py38-django{30,master}-drf{310,311}-tests
+    py{38,39}-django{22,30}-drf310-tests
+    py{38,39}-django{22,30,31}-drf{311,312}-tests
+    py39-djangomaster-drf312-tests
     lint
     docs
 
@@ -16,12 +15,11 @@ commands=
     tests: pytest {posargs:tests} --cov=rest_framework_simplejwt
     docs: make build-docs
 commands_post=
-    py38-django30-drf310: codecov -e TOXENV
+    py39-django31-drf312: codecov -e TOXENV
 basepython=
-    docs: python3.7
-    py36: python3.6
-    py37: python3.7
+    docs: python3.8
     py38: python3.8
+    py39: python3.9
 extras=
     test
     python-jose
@@ -31,20 +29,18 @@ setenv=
 passenv=
     CODECOV_TOKEN
 deps=
-    django20: Django>=2.0,<2.1
-    django21: Django>=2.1,<2.2
     django22: Django>=2.2,<2.3
     django30: Django>=3.0,<3.1
-    drf38: djangorestframework>=3.8,<3.9
-    drf39: djangorestframework>=3.9,<3.10
+    django31: Django>=3.1,<3.2
     drf310: djangorestframework>=3.10,<3.11
     drf311: djangorestframework>=3.11,<3.12
-    py38-django30-drf310: codecov
+    drf312: djangorestframework>=3.12,<3.13
+    py39-django31-drf312: codecov
     djangomaster: https://github.com/django/django/archive/master.tar.gz
 whitelist_externals=make
 
 [testenv:lint]
-basepython=python3.7
+basepython=python3.8
 extras=lint
 commands=
     flake8 {toxinidir}/rest_framework_simplejwt {toxinidir}/tests