From aaef729a822d674696eb43a52e8525c61f779fac Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Tue, 6 Dec 2022 22:43:51 +0100
Subject: [PATCH] Require at least Python 3.8.  Test with 3.8-3.11.

---
 .github/workflows/test.yml | 9 +++++----
 CHANGES.rst                | 4 ++--
 requirements.txt           | 2 +-
 setup.py                   | 4 +++-
 tox.ini                    | 5 +++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a195301..64e0e3b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master, 3.x ]
+    branches: [ master ]
   workflow_dispatch:
 jobs:
   build:
@@ -16,16 +16,17 @@ jobs:
         - ["3.8",   "plone60-py38"]
         - ["3.9",   "plone60-py39"]
         - ["3.10",  "plone60-py310"]
+        - ["3.11",  "plone60-py311"]
     runs-on: ubuntu-latest
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
diff --git a/CHANGES.rst b/CHANGES.rst
index 40ed0ba7..aedb2ea9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ Changelog
 4.1.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Require at least Python 3.8.  Test with 3.8-3.11.  [maurits]
 
 
 4.1.1 (2022-10-28)
@@ -76,7 +76,7 @@ Enhancements:
 
 Breaking change:
 
-- This is for Plone 6 only. At least this is the only version that is tested. 
+- This is for Plone 6 only. At least this is the only version that is tested.
   (Changelog edited later to avoid misunderstandings, use 3.x for Plone 5.2)
   [maurits]
 
diff --git a/requirements.txt b/requirements.txt
index a336f8ca..d476bdc7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-zc.buildout==3.0.0rc3
\ No newline at end of file
+zc.buildout==3.0.1
diff --git a/setup.py b/setup.py
index 31a4f52a..cca689ca 100644
--- a/setup.py
+++ b/setup.py
@@ -18,9 +18,10 @@
         "Framework :: Plone :: Addon",
         "Framework :: Plone :: 6.0",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
@@ -36,6 +37,7 @@
     package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
+    python_requires=">=3.8",
     install_requires=[
         "plone.api",
         "plone.app.dexterity",
diff --git a/tox.ini b/tox.ini
index 5c1e490d..65041c5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.18
 envlist =
-    plone60-py{38,39,310}
+    plone60-py{38,39,310,311}
 
 [testenv]
 # We do not install with pip, but with buildout:
@@ -12,4 +12,5 @@ deps =
 commands_pre =
     plone60: {envbindir}/buildout -Nc {toxinidir}/tests-6.0.x.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
-    {envbindir}/test
+# Note: to run the robot tests, we should pass --all.  Currently all four fail.
+    {envbindir}/test {posargs:-vc}