chore: update test setup

FidelityInternational · Aug 21, 2024 · fc94160 · fc94160
1 parent 5ac495b
commit fc94160
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,10 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.8, 3.9, '3.10']  # latest release minus two
+        python-version: [ 3.9, '3.10']  # latest release minus two
         requirements-file: [
-          django-3_2.txt,
-          django-4_2.txt,
+          django-3_2_cms40.txt,
+          django-4_2_cms40.txt,
+          django-4_2_cms41.txt,
         ]
 
     steps:

diff --git a/test_settings.py b/test_settings.py
@@ -21,6 +21,7 @@
         "djangocms_content_expiry": None,
     },
     "CMS_PERMISSION": True,
+    "CMS_CONFIRM_VERSION4": True,
     "LANGUAGES": (
         ("en", "English"),
         ("de", "German"),

diff --git a/tests/requirements/django-3_2.txt → tests/requirements/django-3_2_cms40.txt b/tests/requirements/django-3_2.txt → tests/requirements/django-3_2_cms40.txt
diff --git a/tests/requirements/django-4_2.txt → tests/requirements/django-4_2_cms40.txt b/tests/requirements/django-4_2.txt → tests/requirements/django-4_2_cms40.txt
diff --git a/tests/requirements/django-4_2_cms41.txt b/tests/requirements/django-4_2_cms41.txt
@@ -0,0 +1,31 @@
+
+argparse
+beautifulsoup4
+coverage<5
+dj-database-url
+django-admin-rangefilter
+django-app-helper
+django-classy-tags>=0.7.2
+django-formtools
+django-polymorphic
+django-sekizai>=0.7
+django-treebeard>=4.3
+djangocms-admin-style>=1.5
+djangocms-text-ckeditor>=5.1.5
+factory-boy
+freezegun
+iptools
+lxml
+mock>=2.0.0
+pyenchant
+pyflakes==1.1.0
+python-coveralls>2.5.0
+sphinx==1.8.5
+sphinxcontrib-spelling<7.0.0 # restriction for py35 tests
+unittest-xml-reporting==1.11.0
+
+django>=4.2,<5.0
+django-cms>=4.1.0
+djangocms-versioning==2.0.2
+https://github.com/django-cms/djangocms-alias/tarball/master#egg=djangocms-alias
+https://github.com/django-cms/djangocms-moderation/tarball/master#egg=djangocms-moderation
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     flake8
     isort
-    py{38,39,310}-dj{32,42}-sqlite-cms40
+    py{39,310}-dj{32,42}-sqlite-cms{40,41}
 
 skip_missing_interpreters=True
 
@@ -13,11 +13,11 @@ deps =
 
     dj32: Django>=3.2,<4.0
     dj42: Django>=4.2,<5.0
-    dj32: -r{toxinidir}/tests/requirements/django-3_2.txt
-    dj42: -r{toxinidir}/tests/requirements/django-4_2.txt
+    dj32_cms40: -r{toxinidir}/tests/requirements/django-3_2_cms40.txt
+    dj42_cms40: -r{toxinidir}/tests/requirements/django-4_2_cms40.txt
+    dj42_cms41: -r{toxinidir}/tests/requirements/django-4_2_cms41.txt
 
 basepython =
-    py38: python3.8
     py39: python3.9
     py310: python3.10