Merge branch 'master' of github.com:molokov/mezzanine into 6.0.1-alpha1

molokov · Dec 26, 2023 · e11bb7b · e11bb7b
2 parents 74dd5c8 + 8f4ed9a
commit e11bb7b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 44 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,51 +14,38 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Django 2.2
-          - tox-env: "py37-dj22"
-            python-version: "3.7"
-          - tox-env: "py38-dj22"
-            python-version: "3.8"
-          - tox-env: "py39-dj22"
-            python-version: "3.9"
-          # Django 3.0
-          - tox-env: "py37-dj30"
-            python-version: "3.7"
-          - tox-env: "py38-dj30"
-            python-version: "3.8"
-          - tox-env: "py39-dj30"
-            python-version: "3.9"
-          # Django 3.1
-          - tox-env: "py37-dj31"
-            python-version: "3.7"
-          - tox-env: "py38-dj31"
-            python-version: "3.8"
-          - tox-env: "py39-dj31"
-            python-version: "3.9"
-          # Django 3.2
-          - tox-env: "py37-dj32"
-            python-version: "3.7"
-          - tox-env: "py38-dj32"
-            python-version: "3.8"
-          - tox-env: "py39-dj32"
-            python-version: "3.9"
-          - tox-env: "py310-dj32"
-            python-version: "3.10"
           # Django 4.0
           - tox-env: "py38-dj40"
             python-version: "3.8"
           - tox-env: "py39-dj40"
             python-version: "3.9"
           - tox-env: "py310-dj40"
             python-version: "3.10"
+          - tox-env: "py311-dj40"
+            python-version: "3.11"
           # Django 4.1
           - tox-env: "py38-dj41"
             python-version: "3.8"
           - tox-env: "py39-dj41"
             python-version: "3.9"
           - tox-env: "py310-dj41"
             python-version: "3.10"
-
+          - tox-env: "py311-dj41"
+            python-version: "3.11"
+          # Django 4.2
+          - tox-env: "py38-dj42"
+            python-version: "3.8"
+          - tox-env: "py39-dj42"
+            python-version: "3.9"
+          - tox-env: "py310-dj42"
+            python-version: "3.10"
+          - tox-env: "py311-dj42"
+            python-version: "3.11"
+          # Django 5.0
+          - tox-env: "py310-dj50"
+            python-version: "3.10"
+          - tox-env: "py311-dj50"
+            python-version: "3.11"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
@@ -139,4 +126,4 @@ jobs:
           fqdn: mezzanine.jupo.org
           jekyll: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/setup.cfg b/setup.cfg
@@ -18,30 +18,29 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     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
+    Framework :: Django :: 4.2
+    Framework :: Django :: 5.0
     Topic :: Internet :: WWW/HTTP
     Topic :: Internet :: WWW/HTTP :: Dynamic Content
     Topic :: Internet :: WWW/HTTP :: WSGI
     Topic :: Software Development :: Libraries :: Application Frameworks
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
-python_requires = >=3.7
+python_requires = >=3.8
 packages = mezzanine
 include_package_data = true
 install_requires =
     django-contrib-comments >= 2.0
-    django >= 2.2
+    django >= 4.0
     tzlocal >= 2
     bleach[css] >= 5
     beautifulsoup4 >= 4.5.3

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39,310}-dj{22,30,31,32,40,41}
+    py{38,39,310,311}-dj{40,41,42,50}
     package
     lint
 
@@ -9,12 +9,10 @@ envlist =
 usedevelop = true
 deps =
     .[testing]
-    dj22: Django>=2.2, <3
-    dj30: Django>=3.0, <3.1
-    dj31: Django>=3.1, <3.2
-    dj32: Django>=3.2, <3.3
     dj40: Django>=4.0, <4.1
     dj41: Django>=4.1, <4.2
+    dj42: Django>=4.2, <4.3
+    dj50: Django>=5.0, <5.1
 commands =
     pytest --basetemp="{envtmpdir}" --junitxml="junit/TEST-{envname}.xml" {posargs}