Update supported Django & Python versions (#1093)

Resolves #1092.
jschneier · Aug 5, 2022 · acb735e · acb735e
1 parent 91205a8
commit acb735e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,15 +15,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ["3.5", "3.6", "3.7", "3.8", "3.9"]
-        django-version: ["2.2", "3.0", "3.1", "3.2"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        django-version: ["3.2", "4.0", "4.1", "main"]
         exclude:
-            - python-version: "3.5"
-              django-version: "3.0"
-            - python-version: "3.5"
-              django-version: "3.1"
-            - python-version: "3.5"
-              django-version: "3.2"
+            - python-version: "3.7"
+              django-version: "4.0"
+            - python-version: "3.7"
+              django-version: "4.1"
+            - python-version: "3.7"
+              django-version: "main"
 
     steps:
       - uses: actions/checkout@v2
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ["3.6"]
+        python-version: ["3.7"]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/AUTHORS b/AUTHORS
@@ -50,6 +50,7 @@ By order of apparition, thanks:
     * Uxío Fuentefría (S3)
     * wigeria (Google Cloud Storage patch)
     * Alexander Demin (Dropbox fixes)
+    * Paolo Melchiorre (tests)
 
 
 Extra thanks to Marty for adding this in Django,

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,20 @@
 django-storages CHANGELOG
 =========================
 
+XXXX-XX-XX
+**********
+
+General
+-------
+
+- Add support for Django 4.0 and 4.1 (`#1093`_)
+- Drop support for Django 2.2, 3.0 and 3.1 (`#1093`_)
+- Drop support for Python 3.5 and 3.6 (`#1093`_)
+
+
+.. _#1093: https://github.com/jschneier/django-storages/pull/1093
+
+
 1.12.3 (2021-10-29)
 *******************
 

diff --git a/setup.cfg b/setup.cfg
@@ -11,28 +11,25 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Environment :: Web Environment
     Framework :: Django
-    Framework :: Django :: 2.2
-    Framework :: Django :: 3.0
-    Framework :: Django :: 3.1
     Framework :: Django :: 3.2
+    Framework :: Django :: 4.0
+    Framework :: Django :: 4.1
     Intended Audience :: Developers
     License :: OSI Approved :: BSD License
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
 
 [options]
 zip_safe=False
-python_requires = >=3.5
+python_requires = >=3.7
 install_requires =
-    Django >= 2.2
+    Django>=3.2
 packages =
     storages
     storages.backends

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,10 @@
 [tox]
 minversion = 1.9
 envlist =
-	py{3.5,3.6,3.7,3.8,3.9}-django2.2
-	py{3.6,3.7,3.8,3.9}-django3.0
-	py{3.6,3.7,3.8,3.9}-django3.1
-	py{3.6,3.7,3.8,3.9,3.10}-django3.2
-	py{3.6,3.7,3.8,3.9,3.10}-djangomain
+	py{3.7,3.8,3.9,3.10}-django3.2
+	py{3.8,3.9,3.10}-django4.0
+	py{3.8,3.9,3.10}-django4.1
+	py{3.8,3.9,3.10}-djangomain
 	flake8
 
 [testenv]
@@ -15,10 +14,9 @@ setenv =
 	PYTHONDONTWRITEBYTECODE = 1
 commands = pytest --cov=storages tests/ {posargs}
 deps =
-	django2.2: Django>=2.2,<3.0
-	django3.0: Django>=3.0,<3.1
-	django3.1: Django>=3.1,<3.2
-	django3.2: Django>=3.2,<4.0
+	django3.2: django~=3.2.9
+	django4.0: django~=4.0.0
+	django4.1: django~=4.1.0
 	djangomain: https://github.com/django/django/archive/main.tar.gz
 	cryptography
 	pytest