Better declaration for install_requires and test matrix

nephila · Nov 27, 2023 · f0d2bc1 · f0d2bc1
1 parent c01f378
commit f0d2bc1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     continue-on-error: ${{ matrix.continue-on-error }}
     strategy:
       matrix:
-        python-version: ["3.12", "3.11", "3.10", "3.9"]
+        python-version: ["3.12", "3.11", "3.10", "3.9", "3.8"]
         django: [50, 42, 32]
         cms: [nocms, cms311, async]
         continue-on-error: [false]
@@ -18,6 +18,8 @@ jobs:
             cms: cms311
           - django: 50
             python-version: 3.9
+          - django: 50
+            python-version: 3.8
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/README.rst b/README.rst
@@ -28,9 +28,9 @@ It supports both tests writted using Django ``TestCase`` and pytest ones
 Supported versions
 ==================
 
-Python: 3.9, 3.10, 3.11
+Python: 3.8, 3.9, 3.10, 3.11, 3.12
 
-Django: 3.2, 4.0, 4.1, 4.2
+Django: 3.2, 4.0, 4.1, 4.2, 5.0
 
 django CMS: 3.11
 

diff --git a/setup.cfg b/setup.cfg
@@ -18,20 +18,22 @@ classifiers =
 	Framework :: Django :: 3.2
 	Framework :: Django :: 4.1
 	Framework :: Django :: 4.2
+	Framework :: Django :: 5.0
 	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
 
 [options]
 include_package_data = True
 install_requires = 
 	dj-database-url
 	docopt
 	six
+	setuptools; python_version>="3.12"
 setup_requires = 
 	setuptools
 packages = find:

diff --git a/tox.ini b/tox.ini
@@ -12,6 +12,7 @@ envlist =
     py{3.11}-django{42,41,40,32}-{cms311,nocms,async}
     py{3.10}-django{42,41,40,32}-{cms311,nocms,async}
     py{3.9}-django{32}-{cms311,nocms,async}
+    py{3.8}-django{32}-{cms311,nocms,async}
 minversion = 3.23
 
 [testenv]
@@ -24,7 +25,6 @@ deps=
     django50: django~=5.0b1
     cms311: https://github.com/yakky/django-cms/archive/release/3.11.x.zip
     cms311: djangocms-text-ckeditor>=5.0,<6.0
-    py3.12: setuptools
     -r{toxinidir}/requirements-test.txt
     async: channels[daphne]~=4.0.0
 passenv =