summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <stephen@that.guru>2018-06-24 20:55:48 +0100
committerDaniel Axtens <dja@axtens.net>2018-08-26 12:14:40 +1000
commita27f36fb784867e434527b8e65064ae3bdb12c82 (patch)
tree58bcfe4b05591f0649689d7e195c61be6d51e14a
parentc9cc59dac70d76971a5342ca53e2b13eb93592de (diff)
downloadpatchwork-a27f36fb784867e434527b8e65064ae3bdb12c82.tar
patchwork-a27f36fb784867e434527b8e65064ae3bdb12c82.tar.gz
Add support for Django REST Framework 3.7, 3.8
No breaking changes that concern us here. Signed-off-by: Stephen Finucane <stephen@that.guru> Reviewed-by: Daniel Axtens <dja@axtens.net> Signed-off-by: Daniel Axtens <dja@axtens.net>
-rw-r--r--README.rst2
-rw-r--r--releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml6
-rw-r--r--releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml6
-rw-r--r--requirements-dev.txt2
-rw-r--r--requirements-prod.txt2
-rw-r--r--tox.ini5
6 files changed, 18 insertions, 5 deletions
diff --git a/README.rst b/README.rst
index 4a970ec..ddc4b98 100644
--- a/README.rst
+++ b/README.rst
@@ -45,7 +45,7 @@ Requirements
- Django (1.8 - 1.11)
-- Django REST Framework (3.2 - 3.6)
+- Django REST Framework (3.4 - 3.8)
- Django Filters (1.0)
diff --git a/releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml b/releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml
new file mode 100644
index 0000000..4bf92c9
--- /dev/null
+++ b/releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ `Django REST Framework 3.7
+ <http://www.django-rest-framework.org/topics/release-notes/#370/>`_ is now
+ supported.
diff --git a/releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml b/releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml
new file mode 100644
index 0000000..dc2d2c8
--- /dev/null
+++ b/releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ `Django REST Framework 3.8
+ <http://www.django-rest-framework.org/topics/release-notes/#380/>`_ is now
+ supported.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7a8fdb9..b12246d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
Django>=1.8,<2.0
-djangorestframework>=3.4,<3.7
+djangorestframework>=3.4,<3.9
django-filter>=1.0,<1.1
-r requirements-test.txt
diff --git a/requirements-prod.txt b/requirements-prod.txt
index d249ad8..42ff8ec 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,5 +1,5 @@
Django>=1.8,<2.0
-djangorestframework>=3.4,<3.7
+djangorestframework>=3.4,<3.9
django-filter>=1.0,<1.1
psycopg2>=2.7,<2.8
sqlparse==0.2.4
diff --git a/tox.ini b/tox.ini
index a64d958..c1bc64e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,9 @@ deps =
django19: django>=1.9,<1.10
django110: django>=1.10,<1.11
django111: django>=1.11,<2.0
- django{18,19,110}: djangorestframework>=3.4,<3.7
- django111: djangorestframework>=3.6,<3.7
+ django{18,19}: djangorestframework>=3.4,<3.7
+ django110: djangorestframework>=3.4,<3.9
+ django111: djangorestframework>=3.6,<3.9
django{18,19,110,111}: django-filter>=1.0,<1.1
setenv =
DJANGO_SETTINGS_MODULE = patchwork.settings.dev