Plone 6 compatibility (#12)

cekk · mamico · web-flow · commit ff0d1269a17f · 2026-03-26T15:51:41.000+01:00
* Plone 6 compatibility

* cleanup

* ci

* ci

* ci

* ci

* update changelog

* remove unused tests

* remove unused tests

---------

Co-authored-by: Mauro Amico &lt;mauro.amico@gmail.com&gt;
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
diff --git a/.github/workflows/pyroma.yml b/.github/workflows/pyroma.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -28,7 +28,7 @@ jobs:
 
       # install pyroma
       - name: install pyroma
-        run: pip install pyroma
+        run: pip install pyroma==4.2
 
       # run pyroma
       - name: run pyroma
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
diff --git a/.github/workflows/zpretty.yml b/.github/workflows/zpretty.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 2.1.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Plone 6 compatibility. Use 2.x tags for Plone < 6. [cekk]
+  [cekk]
 
 
 2.1.0 (2023-05-31)
@@ -50,10 +51,10 @@ Changelog
 - Add flag to control panel that allow to enable cookie banner
 - Add cookie prefix to control panel to control the js plugin option
 - Allow to select endpoint for consent registry
-- Add domain whitelist so in case you have site with multiple domain can show 
+- Add domain whitelist so in case you have site with multiple domain can show
   the banner in selected domain
 - Add matomo
-- Some minor fix to prevent cases where site editor remove configuration lines 
+- Some minor fix to prevent cases where site editor remove configuration lines
   partially
 - Add log tracking to new introduced actions
 - Fix problem loading twitter timeline in tile manager from
diff --git a/constraints_plone60.txt b/constraints_plone60.txt
@@ -0,0 +1 @@
+-c https://dist.plone.org/release/6.0-latest/requirements.txt
diff --git a/constraints_plone61.txt b/constraints_plone61.txt
@@ -0,0 +1 @@
+-c https://dist.plone.org/release/6.1-latest/requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,2 @@
--c constraints.txt
 setuptools
 zc.buildout
diff --git a/src/redturtle/chefcookie/tests/robot/test_example.robot b/src/redturtle/chefcookie/tests/robot/test_example.robot
diff --git a/src/redturtle/chefcookie/tests/test_robot.py b/src/redturtle/chefcookie/tests/test_robot.py
diff --git a/src/redturtle/chefcookie/tests/test_setup.py b/src/redturtle/chefcookie/tests/test_setup.py
diff --git a/src/redturtle/chefcookie/transformers/transform.py b/src/redturtle/chefcookie/transformers/transform.py
@@ -12,7 +12,7 @@
 from zope.component import getMultiAdapter
 from zope.component import getUtility
 from zope.component import queryMultiAdapter
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import ComponentLookupError
 from zope.interface import implementer
 from zope.interface import Interface
 
diff --git a/test_plone52.cfg b/test_plone52.cfg
@@ -9,25 +9,3 @@ update-versions-file = test_plone52.cfg
 
 [versions]
 plone.testing = 7.0.1
-
-# Added by buildout at 2021-12-30 15:58:32.220210
-collective.recipe.vscode = 0.1.7
-flake8 = 3.9.2
-mccabe = 0.6.1
-plone.recipe.codeanalysis = 3.0.1
-pycodestyle = 2.7.0
-pyflakes = 2.3.1
-
-# Required by:
-# redturtle.chefcookie==1.0
-collective.jsconfiguration = 0.1.1
-
-# Required by:
-# redturtle.chefcookie==1.0
-collective.regjsonify = 0.3.0
-
-# Added by buildout at 2022-01-05 09:23:45.884226
-zpretty = 2.1.0
-
-# Added by buildout at 2022-02-02 17:29:45.340786
-zipp = 1.1.1
diff --git a/test_plone60.cfg b/test_plone60.cfg
@@ -0,0 +1,8 @@
+[buildout]
+
+extends =
+    https://raw.github.com/collective/buildout.plonetest/master/test-6.0.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
+    base.cfg
+
+[versions]
diff --git a/test_plone61.cfg b/test_plone61.cfg
@@ -0,0 +1,6 @@
+[buildout]
+extends =
+    https://raw.github.com/collective/buildout.plonetest/master/test-6.1.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
+    base.cfg
+[versions]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+-c https://dist.plone.org/release/6.0-latest/requirements.txt`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+-c https://dist.plone.org/release/6.1-latest/requirements.txt`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`--c constraints.txt`
`2`	`1`	`setuptools`
`3`	`2`	`zc.buildout`