tox: Drop support for Django < 2.2, Python < 3.6

Each of these versions of Django is now EOL, and Python 3.5 will be EOL
by time we release the next version. Drop it.

The Python 2.7 cleanup will be done separately.

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

diff --git a/.travis.yml b/.travis.yml
index 71777d37fce3c1d7c53822ae6bb722a4fa52230f..5f15f59eea47cf959ab673f4041f0f4a531eeccc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ dist: xenial
 sudo: false
 
 python:
-  - 2.7
-  - 3.5
   - 3.6
   - 3.7
   - 3.8

diff --git a/releasenotes/notes/remove-django-1-11-2-0-and-2-1-support-4e98262f9be9911b.yaml b/releasenotes/notes/remove-django-1-11-2-0-and-2-1-support-4e98262f9be9911b.yaml
new file mode 100644 (file)
index 0000000..2f1a2c6
--- /dev/null
+++ b/releasenotes/notes/remove-django-1-11-2-0-and-2-1-support-4e98262f9be9911b.yaml
@@ -0,0 +1,12 @@
+---
+upgrade:
+  - |
+    Django 1.11, 2.0 and 2.1 are no longer supported. These are no longer
+    supported upstream and most distributions provide a newer version.
+  - |
+    djangorestframework 3.6, 3.7, 3.8 and 3.9 are no longer supported. These
+    were only used with Django 1.11 to 2.1 and are not compatible with any
+    version now supported by Patchwork.
+  - |
+    django-filter 1.1.0 is no longer supported. This was only used with Django
+    1.11 and is not compatible with any version now supported by Patchwork.

diff --git a/releasenotes/notes/remove-python-2-7-3-5-support-4a1314b1145cb1db.yaml b/releasenotes/notes/remove-python-2-7-3-5-support-4a1314b1145cb1db.yaml
new file mode 100644 (file)
index 0000000..0ca5c51
--- /dev/null
+++ b/releasenotes/notes/remove-python-2-7-3-5-support-4a1314b1145cb1db.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Python 2.7 and 3.5 are no longer supported. These are no longer supported
+    upstream and most distributions provide a newer version.

diff --git a/requirements-dev.txt b/requirements-dev.txt
index b165f3a4fd699b753de3488b4ac1c88dcda7e0f9..4415209a12faee4cc9baf1ae9fac1b29b57777d1 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,10 +1,6 @@
 Django~=2.2.0; python_version >= '3.5'  # pyup: >= 2.2.0,<2.3.0
-Django~=1.11.0; python_version < '3.0'  # pyup: ignore
 djangorestframework~=3.11.0; python_version >= '3.5'
-djangorestframework~=3.9.0; python_version < '3.0'  # pyup: ignore
 django-filter~=2.2.0; python_version >= '3.5'  # pyup: >=2.2.0,<2.3.0
-django-filter~=1.1.0; python_version < '3.0'  # pyup: ignore
 django-debug-toolbar~=2.0.0; python_version >= '3.5'  # pyup: ignore
-django-debug-toolbar~=1.11.0; python_version < '3.0'  # pyup: ignore
 django-dbbackup~=3.2.0  # pyup: >=3.2.0,<3.3.0
 -r requirements-test.txt

diff --git a/requirements-prod.txt b/requirements-prod.txt
index 4093b3aac6ed243227519fa927f431c6f9d57932..f6477ac2b05831610dc1e1d95f0e0c4c72118951 100644 (file)
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,8 +1,5 @@
 Django~=2.2.0; python_version >= '3.5'  # pyup: >=2.2.0,<2.3.0
-Django~=1.11.0; python_version < '3.0'  # pyup: ignore
 djangorestframework~=3.11.0; python_version >= '3.5'  # pyup: >=3.10.0,<3.12.0
-djangorestframework~=3.9.0; python_version < '3.0'  # pyup: ignore
 django-filter~=2.2.0; python_version >= '3.5'  # pyup: >=2.2.0,<2.3.0
-django-filter~=1.1.0; python_version < '3.0'  # pyup: ignore
 psycopg2-binary~=2.8.0  # pyup: >=2.8.0,<2.9.0
 sqlparse~=0.3.0  # pyup: >=0.3.0,<0.4.0

diff --git a/tox.ini b/tox.ini
index 8fbb136dbd248251b532bf3e07614c8709bd1d8e..39254c84229b28fe02ef9bc1b862819370c7fcb5 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.2
-envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22}
+envlist = pep8,docs,py{36,37,38}-django{22}
 skipsdist = true
 ignore_basepython_conflict = true
 
@@ -8,25 +8,14 @@ ignore_basepython_conflict = true
 basepython = python3
 deps =
     -r{toxinidir}/requirements-test.txt
-    django111: django>=1.11,<2.0
-    django111: djangorestframework>=3.6,<3.12; 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.12
-    django{20,21}: django-filter>=2.0,<3.0
     django22: django>=2.2,<2.3
     django22: djangorestframework>=3.10,<3.12
     django22: django-filter>=2.1,<3.0
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1
-    DJANGO_LIVE_TEST_SERVER_ADDRESS = localhost:9000-9200
-    py27: PYTHONWARNINGS = once
-    py{34,36}:PYTHONWARNINGS = once,ignore::ImportWarning:backports
-    py35:PYTHONWARNINGS = once,ignore::ResourceWarning:unittest.suite,ignore::ImportWarning:backports
+    py36: PYTHONWARNINGS = once,ignore::ResourceWarning:unittest.suite,ignore::ImportWarning:backports
+    py{37,38}: PYTHONWARNINGS = once
 passenv =
     http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
     PW_TEST_DB_TYPE PW_TEST_DB_USER PW_TEST_DB_PASS PW_TEST_DB_HOST
@@ -84,4 +73,4 @@ commands =
 
 [travis]
 python =
-    2.7: py27, pep8, coverage
+    3.6: py36, pep8, coverage