Add Plone 6.1 compatibility

Also cleanup old code and fix tests

Author: laulaz

.github/workflows/buildout-27-52.yml

@@ -2,15 +2,15 @@ name: 2.7 5.2 Run buildout and instance
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/[email protected]
+      - uses: actions/checkout@v4
+      - name: Set up pyenv and Python
+        uses: "gabrielfalcao/pyenv-action@v18"
         with:
-          python-version: 2.7.18
+          default: 2.7.18
       - name: Caching
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v4
         with:
           path: |
             eggs

.github/workflows/buildout-313-61.yml

@@ -0,0 +1,26 @@
+name: 3.13 6.1 Run buildout and instance
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.13
+      - name: Caching
+        uses: actions/cache@v4
+        with:
+          path: |
+            eggs
+          key: cache-Py3.13-Plone6.1
+      - name: Install venv
+        run: |
+          pip install virtualenv
+          virtualenv -p 3 .
+          bin/pip install -r requirements-6.1.txt
+          bin/buildout -c test-6.1.x.cfg install instance
+      - name: Check that instance starts
+        run: |
+          bin/instance run startup.py

.github/workflows/buildout-38-52.yml

@@ -2,15 +2,15 @@ name: 3.8 5.2 Run buildout and instance
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - name: Set up python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Caching
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v4
         with:
           path: |
             eggs

.github/workflows/buildout-39-60.yml

@@ -2,15 +2,15 @@ name: 3.9 6.0 Run buildout and instance
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - name: Set up python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Caching
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v4
         with:
           path: |
             eggs
@@ -20,7 +20,7 @@ jobs:
           pip install virtualenv
           virtualenv -p 3 .
           bin/pip install -r requirements.txt
-          bin/buildout -c test-6.x.cfg install instance
+          bin/buildout -c test-6.0.x.cfg install instance
       - name: Check that instance starts
         run: |
           bin/instance run startup.py

.github/workflows/test-27-52.yml

@@ -2,15 +2,15 @@ name: 2.7 5.2 Run tests
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/[email protected]
+      - uses: actions/checkout@v4
+      - name: Set up pyenv and Python
+        uses: "gabrielfalcao/pyenv-action@v18"
         with:
-          python-version: 2.7
+          default: 2.7.18
       - name: Caching
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v4
         with:
           path: |
             eggs

.github/workflows/test-313-61.yml

@@ -0,0 +1,26 @@
+name: 3.13 6.1 Run tests
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.13
+      - name: Caching
+        uses: actions/cache@v4
+        with:
+          path: |
+            eggs
+          key: cache-Py3.13-Plone6.1
+      - name: Install venv
+        run: |
+          pip install virtualenv
+          virtualenv -p 3 .
+          bin/pip install -r requirements-6.1.txt
+          bin/buildout -c test-6.1.x.cfg install test
+      - name: Run unit tests
+        run: |
+          bin/test

.github/workflows/test-38-52.yml

@@ -2,15 +2,15 @@ name: 3.8 5.2 Run tests
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - name: Set up python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Caching
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v4
         with:
           path: |
             eggs

.github/workflows/test-39-60.yml

@@ -2,15 +2,15 @@ name: 3.9 6.0 Run tests
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - name: Set up python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Caching
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v4
         with:
           path: |
             eggs
@@ -20,7 +20,7 @@ jobs:
           pip install virtualenv
           virtualenv -p 3 .
           bin/pip install -r requirements.txt
-          bin/buildout -c test-6.x.cfg install test
+          bin/buildout -c test-6.0.x.cfg install test
       - name: Run unit tests
         run: |
           bin/test

bootstrap.py

@@ -1,3 +1,3 @@
 [buildout]
 extends =
-    test-plone-4.3.x.cfg
+    test-6.0.x.cfg