Merge pull request #57 from collective/fix-gha

Support Plone 6.0+ and Python3.9+

Author: ale-rt

.gha.cfg

@@ -5,3 +5,8 @@ extends = plone-x.x.x.cfg
 recipe = plone.recipe.codeanalysis
 pre-commit-hook = False
 return-status-codes = True
+
+[versions]
+# Use the versions from the requirements files
+setuptools =
+zc.buildout =

.github/workflows/tests.yml

@@ -15,19 +15,16 @@ jobs:
     strategy:
       matrix:
         config:
-          - ["Py2.7-Plone5.1", "2.7", "5.1"]
-          - ["Py2.7-Plone5.2", "2.7", "5.2"]
-          - ["Py3.6-Plone5.2", "3.6", "5.2"]
-          - ["Py3.7-Plone5.2", "3.7", "5.2"]
-          - ["Py3.8-Plone5.2", "3.8", "5.2"]
+          - ["Py3.9-Plone6.0", "3.9", "6.0"]
+          - ["Py3.13-Plone6.1", "3.13", "6.1"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.config[1] }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.config[1] }}
       - name: Pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pip
@@ -44,10 +41,14 @@ jobs:
           echo "[buildout]" > $HOME/.buildout/default.cfg
           echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
           echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
-          wget https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz
-          mkdir geckodriver && tar zxvf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          echo "abi-tag-eggs = true" >> $HOME/.buildout/default.cfg
+
+      - name: Install requirements and buildout
+        run: |
+          pip install -r requirements-${{ matrix.config[2] }}.txt
+
+      - name: Run buildout
+        run: |
           sed -ie "s#plone-x.x.x.cfg#plone-${{ matrix.config[2] }}.x.cfg#" .gha.cfg
           buildout -c .gha.cfg
       - name: Test

CHANGES.rst

@@ -1,10 +1,11 @@
 Changelog
 =========
 
-3.0.1 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Support only Python 3.9+ and Plone 6.0+
+  [ale-rt]
 
 
 3.0.0 (2021-02-17)

Makefile

@@ -37,8 +37,17 @@ Basic Installation
 Compatibility
 -------------
 
-For Plone 5.1 and 5.2 you should use version 3.x.
-For Plone 4.3 and 5.0 you should use version 2.x.
+This table shows which version of collective.workspace is compatible with which versions of Plone and Python:
+
++---------------+----------------------+---------------------------+
+| Plone         | Python               | collective.workspace      |
++===============+======================+===========================+
+| 6.0+          | 3.9+                 | 4                         |
++---------------+----------------------+---------------------------+
+| 5.1, 5.2      | 2.7 - 3.8            | 3                         |
++---------------+----------------------+---------------------------+
+| 4.3, 5.0      | 2.7                  | 2                         |
++---------------+----------------------+---------------------------+
 
 Custom Workspace Groups
 -----------------------

README.rst

@@ -50,7 +50,7 @@ flake8-extensions =
 # flake8-select = E123
 
 [test]
-recipe = collective.xmltestreport
+recipe = zc.recipe.testrunner
 eggs = ${instance:eggs}
 defaults = ['-s', 'collective.workspace', '--auto-color', '--auto-progress']
 environment = environment
@@ -106,4 +106,4 @@ mode = 755
 [versions]
 collective.workspace =
 setuptools =
-zc.buildout =
+zc.buildout =

base.cfg

@@ -0,0 +1,9 @@
+[buildout]
+extends =
+    base.cfg
+    https://dist.plone.org/release/6.0-latest/versions.cfg
+    https://dist.plone.org/release/6.0-latest/versions-ecosystem.cfg
+    https://dist.plone.org/release/6.0-latest/versions-extra.cfg
+find-links += https://dist.plone.org/thirdparty/
+versions=versions
+show-picked-versions = true

plone-5.1.x.cfg

@@ -0,0 +1,9 @@
+[buildout]
+extends =
+    base.cfg
+    https://dist.plone.org/release/6.1-latest/versions.cfg
+    https://dist.plone.org/release/6.1-latest/versions-ecosystem.cfg
+    https://dist.plone.org/release/6.1-latest/versions-extra.cfg
+find-links += https://dist.plone.org/thirdparty/
+versions=versions
+show-picked-versions = true