From 1fc962d55153a0b9bffc334bffa929ecfae9c8bd Mon Sep 17 00:00:00 2001 From: Conor Holden Date: Wed, 6 Nov 2024 19:48:08 +0100 Subject: [PATCH] :construction_worker: change CI to CMS 4 --- .github/workflows/test.yml | 2 +- cms_helper.py | 3 ++- setup.cfg | 2 +- tox.ini | 6 ++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ab3383..62e531d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: matrix: python-version: ["3.11", "3.10", "3.9"] django: [42, 41, 32] - cms: [311, 39] + cms: [4] continue-on-error: [true] exclude: - django: 41 diff --git a/cms_helper.py b/cms_helper.py index 528549e..e884474 100755 --- a/cms_helper.py +++ b/cms_helper.py @@ -11,6 +11,7 @@ def gettext(s): NOSE_ARGS=[ "-s", ], + CMS_CONFIRM_VERSION4=True, ROOT_URLCONF="tests.test_utils.urls", INSTALLED_APPS=[ "easy_thumbnails", @@ -18,7 +19,7 @@ def gettext(s): "taggit", "taggit_autosuggest", "meta", - "djangocms_page_tags", + # "djangocms_page_tags", "tests.test_utils", ], LANGUAGE_CODE="en", diff --git a/setup.cfg b/setup.cfg index fc2323a..cecb36b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ classifiers = [options] include_package_data = True install_requires = - django-cms>=3.7,<4.0 + django-cms~=4.1 django-meta>=2.4.0 django-filer>=3.0 setup_requires = diff --git a/tox.ini b/tox.ini index 4ee37ba..f325de7 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,7 @@ envlist = ruff pypi-description towncrier - py{311,310,39}-django{42,41}-cms{311} - py{311,310,39}-django{32}-cms{311,39} + py{311,310,39}-django{42,32}-cms4 minversion = 3.22 [testenv] @@ -18,8 +17,7 @@ deps = django32: Django~=3.2.0 django41: Django~=4.1.0 django42: Django~=4.2.0 - cms39: https://github.com/django-cms/django-cms/archive/release/3.9.x.zip - cms311: https://github.com/yakky/django-cms/archive/release/3.11.x.zip + cms4: django-cms~=4.1.0 djangocms-page-tags>=1.0.0 -r{toxinidir}/requirements-test.txt passenv =