Merge pull request #230 from johnthagen/patch-2

Support DRF 3.11
jazzband · Apr 13, 2020 · 80c6e7e · 80c6e7e
2 parents 00476b0 + c5fbe8a
commit 80c6e7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -59,13 +59,13 @@ jobs:
     docker:
       - image: circleci/python:3.7
         environment:
-          TOXENV: 'py37-django22-drf{39,310}-tests'
+          TOXENV: 'py37-django22-drf{39,310,311}-tests'
   django30:
     <<: *common
     docker:
       - image: circleci/python:3.8
         environment:
-          TOXENV: 'py38-django30-drf310-tests'
+          TOXENV: 'py38-django30-drf{310,311}-tests'
   djangomaster:
     working_directory: ~/repo
     steps:

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
@@ -8,7 +8,7 @@ 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)
+* Django REST Framework (3.8, 3.9, 3.10, 3.11)
 
 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

diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,8 @@
 envlist=
     py36-django20-drf{38,39}-tests
     py37-django21-drf{39,310}-tests
-    py37-django22-drf{39,310}-tests
-    py38-django{30,master}-drf310-tests
+    py37-django22-drf{39,310,311}-tests
+    py38-django{30,master}-drf{310,311}-tests
     lint
     docs
 
@@ -43,6 +43,7 @@ deps=
     drf38: djangorestframework>=3.8,<3.9
     drf39: djangorestframework>=3.9,<3.10
     drf310: djangorestframework>=3.10,<3.11
+    drf311: djangorestframework>=3.11,<3.12
     py38-django30-drf310: codecov
     djangomaster: https://github.com/django/django/archive/master.tar.gz
 whitelist_externals=make