requirements: Add support for Django 4.0, drop 3.1

An older release note that mistakenly stated Django 3.1 had been removed
is updated to reflect the fact that this was actually 3.0.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py
index c2703a27bb14b19764b10335fbf937abd8c96fb1..1293bc2d04cc35625a49bdc6a8fe7a16e35d9481 100644 (file)
--- a/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -38,6 +38,8 @@ TIME_ZONE = 'Australia/Canberra'
 
 USE_I18N = False
 
+USE_TZ = False
+
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 
 ROOT_URLCONF = 'patchwork.urls'

diff --git a/releasenotes/notes/django-3-2-support-363b32e74bdcf017.yaml b/releasenotes/notes/django-3-2-support-363b32e74bdcf017.yaml
index 039535e92d5bddcafdc7e20f9280d39afda99a6b..a429e615cce0cc2996f14263649cd0f78ddb1d0e 100644 (file)
--- a/releasenotes/notes/django-3-2-support-363b32e74bdcf017.yaml
+++ b/releasenotes/notes/django-3-2-support-363b32e74bdcf017.yaml
@@ -5,5 +5,5 @@ features:
     supported.
 upgrade:
   - |
-    Django 3.1 is no longer supported. It is no longer supported upstream and
+    Django 3.0 is no longer supported. It is no longer supported upstream and
     most distributions provide a newer version.

diff --git a/releasenotes/notes/django-4-0-support-2300ee7b04d55a50.yaml b/releasenotes/notes/django-4-0-support-2300ee7b04d55a50.yaml
new file mode 100644 (file)
index 0000000..2d941f5
--- /dev/null
+++ b/releasenotes/notes/django-4-0-support-2300ee7b04d55a50.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    `Django 4.0 <https://docs.djangoproject.com/en/dev/releases/4.0/>`_ is
+    now supported.
+upgrade:
+  - |
+    Django 3.1 is no longer supported. It is no longer supported upstream and
+    most distributions provide a newer version.

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 437b1e8bf2f59f85b0adfa0ec7c6e549bf196927..8935f1743845b0ee3508636bfb55679e72e73a2a 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
-Django~=3.2.0
-djangorestframework~=3.12.0
+Django~=4.0.0
+djangorestframework~=3.13.0
 django-filter~=21.1.0
 django-debug-toolbar~=3.2.0
 django-dbbackup~=3.3.0

diff --git a/requirements-prod.txt b/requirements-prod.txt
index fa6bc95f5e2b1f3dd9b37c047b2fa54f50bc0382..8dafa172f36cef5fbc8c470a1a9966a864131935 100644 (file)
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,5 +1,5 @@
-Django~=3.2.0
-djangorestframework~=3.12.0
+Django~=4.0.0
+djangorestframework~=3.13.0
 django-filter~=21.1.0
-psycopg2-binary~=2.8.0
+psycopg2~=2.9.0
 sqlparse~=0.4.0

diff --git a/requirements-test.txt b/requirements-test.txt
index 62b33d9affc0c672f534c0a8fed3d2cfde99963c..ccf3a5695b1eb90b91db41b4d4ddb2f5e3267982 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,4 +1,4 @@
-mysqlclient~=2.0.0
+mysqlclient~=2.1.0
 psycopg2-binary~=2.9.0
 sqlparse~=0.4.0
 python-dateutil~=2.8.0

diff --git a/tox.ini b/tox.ini
index 374cbb94d2afb673f665c71bb0d94c525747caeb..72419bedf9ce7bd9b2c09fcd1f71b62555ca47d4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.2
-envlist = pep8,docs,py{36,37,38,39}-django{22,31,32}
+envlist = pep8,docs,py{36,37,38,39}-django{22,32},py{38,39,310}-django{40,}
 skipsdist = true
 ignore_basepython_conflict = true
 
@@ -9,14 +9,14 @@ basepython = python3
 deps =
     -r{toxinidir}/requirements-test.txt
     django22: django~=2.2.0
-    django22: djangorestframework~=3.12.0
+    django22: djangorestframework~=3.13.0
     django22: django-filter~=21.1.0
-    django31: django~=3.1.0
-    django31: djangorestframework~=3.12.0
-    django31: django-filter~=21.1.0
     django32: django~=3.2.0
-    django32: djangorestframework~=3.12.0
+    django32: djangorestframework~=3.13.0
     django32: django-filter~=21.1.0
+    django40: django~=4.0.0
+    django40: djangorestframework~=3.13.0
+    django40: django-filter~=21.1.0
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1