diff mbox series

[5/5] Add support for Django 3.1

Message ID 20200827141406.18231-5-ajd@linux.ibm.com
State New
Headers show
Series [1/5] templates: Replace ifequal and ifnotequal with if | expand

Commit Message

Andrew Donnellan Aug. 27, 2020, 2:14 p.m. UTC
Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com>
---
 releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml | 5 +++++
 requirements-dev.txt                                        | 2 +-
 requirements-prod.txt                                       | 2 +-
 tox.ini                                                     | 5 ++++-
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml
diff mbox series

Patch

diff --git a/releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml b/releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml
new file mode 100644
index 000000000000..dff8af13a846
--- /dev/null
+++ b/releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml
@@ -0,0 +1,5 @@ 
+---
+features:
+  - |
+    `Django 3.1 <https://docs.djangoproject.com/en/dev/releases/3.1/>`_ is
+    now supported.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 022f465deee5..ce306cf3761d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@ 
-Django~=3.0.0
+Django~=3.1.0
 djangorestframework~=3.11.0
 django-filter~=2.3.0
 django-debug-toolbar~=2.2.0
diff --git a/requirements-prod.txt b/requirements-prod.txt
index dc86ce0c042f..b7ca00b59310 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,4 +1,4 @@ 
-Django~=3.0.0
+Django~=3.1.0
 djangorestframework~=3.11.0
 django-filter~=2.3.0
 psycopg2-binary~=2.8.0
diff --git a/tox.ini b/tox.ini
index 0e4c78fbff2f..80b43a600bad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@ 
 [tox]
 minversion = 3.2
-envlist = pep8,docs,py{36,37,38}-django{22,30}
+envlist = pep8,docs,py{36,37,38}-django{22,30,31}
 skipsdist = true
 ignore_basepython_conflict = true
 
@@ -14,6 +14,9 @@  deps =
     django30: django>=3.0,<3.1
     django30: djangorestframework>=3.10,<3.12
     django30: django-filter>=2.2,<3.0
+    django31: django>=3.1,<3.2
+    django31: djangorestframework>=3.10,<3.12
+    django31: django-filter>=2.3,<3.0
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1