diff options
| author | Stephen Finucane <stephen@that.guru> | 2019-09-09 10:12:55 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephen@that.guru> | 2019-09-09 11:53:47 +0100 |
| commit | 0a9705576f2afd2c3ec5c7fd55c616e8c07d6530 (patch) | |
| tree | 29dd388bd06146b043bf0f2808527c80103f5165 | |
| parent | 7f501f42038efcd909df6392fbea5d86c441f16d (diff) | |
| download | patchwork-0a9705576f2afd2c3ec5c7fd55c616e8c07d6530.tar patchwork-0a9705576f2afd2c3ec5c7fd55c616e8c07d6530.tar.gz | |
Add support for djangorestframework 3.10
This is necessary for proper Django 2.2 support. We retain support for
older versions since 3.10 is Python 3-only.
Signed-off-by: Stephen Finucane <stephen@that.guru>
| -rw-r--r-- | releasenotes/notes/django-rest-framework-3-10-37a8c0713d3c7499.yaml | 6 | ||||
| -rw-r--r-- | requirements-dev.txt | 3 | ||||
| -rw-r--r-- | requirements-prod.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 9 |
4 files changed, 15 insertions, 6 deletions
diff --git a/releasenotes/notes/django-rest-framework-3-10-37a8c0713d3c7499.yaml b/releasenotes/notes/django-rest-framework-3-10-37a8c0713d3c7499.yaml new file mode 100644 index 0000000..46227d7 --- /dev/null +++ b/releasenotes/notes/django-rest-framework-3-10-37a8c0713d3c7499.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + `Django REST Framework 3.10 + <https://www.django-rest-framework.org/community/3.10-announcement/>`_ is + now supported. diff --git a/requirements-dev.txt b/requirements-dev.txt index 7964a53..81e35f4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,7 @@ Django==2.2.5; python_version >= '3.5' Django==1.11.24; python_version < '3.0' # pyup: ignore -djangorestframework==3.9.2 +djangorestframework==3.10.3; python_version >= '3.5' +djangorestframework==3.9.4; python_version < '3.0' # pyup: ignore django-filter==2.2.0; python_version >= '3.5' django-filter==1.1.0; python_version < '3.0' # pyup: ignore django-debug-toolbar==1.11 diff --git a/requirements-prod.txt b/requirements-prod.txt index 7e9772e..4a7ca63 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,6 +1,7 @@ Django==2.2.5; python_version >= '3.5' Django==1.11.24; python_version < '3.0' # pyup: ignore -djangorestframework==3.9.2 +djangorestframework==3.10.3; python_version >= '3.5' +djangorestframework==3.9.4; python_version < '3.0' # pyup: ignore django-filter==2.2.0; python_version >= '3.5' django-filter==1.1.0; python_version < '3.0' # pyup: ignore psycopg2-binary==2.8.3 @@ -1,21 +1,22 @@ [tox] minversion = 2.0 -envlist = pep8,docs,py{27}-django111,py{35,36,37}-django{111,20,21,22} +envlist = pep8,docs,py27-django111,py{35,36,37}-django{111,20,21,22} skipsdist = True [testenv] deps = -r{toxinidir}/requirements-test.txt django111: django>=1.11,<2.0 - django111: djangorestframework>=3.6,<3.10 + django111: djangorestframework>=3.6,<3.11; python_version >= '3.5' + django111: djangorestframework>=3.6,<3.10; python_version < '3.0' django111: django-filter>=1.0,<3.0; python_version >= '3.5' django111: django-filter>=1.0,<2.0; python_version < '3.0' django20: django>=2.0,<2.1 django21: django>=2.1,<2.2 - django{20,21}: djangorestframework>=3.7,<3.10 + django{20,21}: djangorestframework>=3.7,<3.11 django{20,21}: django-filter>=2.0,<3.0 django22: django>=2.2,<2.3 - django22: djangorestframework>=3.9.2 + django22: djangorestframework>=3.10,<3.11 django22: django-filter>=2.1,<3.0 setenv = DJANGO_SETTINGS_MODULE = patchwork.settings.dev |