From 748e0f63a55315ed612f60b92ee481fe987bfa0d Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Thu, 15 Dec 2022 08:40:25 +0100
Subject: [PATCH] Fix GHA: ubuntu-latest no longer contains Python 3.5 and 3.6

---
 .github/workflows/tests.yml | 11 ++++++-----
 .meta.toml                  |  3 ++-
 CHANGES.rst                 |  2 ++
 setup.py                    |  4 ++--
 tox.ini                     |  3 ++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d50b7f7..35d0290 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ubuntu
+        - ["ubuntu", "ubuntu-20.04"]
         config:
         # [Python version, tox env]
         - ["3.9",   "lint"]
@@ -28,22 +28,23 @@ jobs:
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
+        - ["3.11",  "py311"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
         - ["2.7",   "py27-zserver"]
         - ["3.7",   "py37-ip_range"]
 
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os[1] }}
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     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/.meta.toml b/.meta.toml
index 249e0d8..13cc001 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "b5df3766ff8923477f3d24729b19504f0c401a2e"
+commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"
 
 [python]
 with-pypy = false
@@ -11,6 +11,7 @@ with-docs = true
 with-sphinx-doctests = false
 with-windows = false
 with-future-python = false
+with-macos = false
 
 [coverage]
 fail-under = 89
diff --git a/CHANGES.rst b/CHANGES.rst
index f098e7a..409fadb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,8 @@ Change Log
 ------------------
 
 
+- Add support for Python 3.11.
+
 2.7.1 (2022-10-04)
 ------------------
 
diff --git a/setup.py b/setup.py
index 0c34d46..106448d 100644
--- a/setup.py
+++ b/setup.py
@@ -43,9 +43,9 @@ def _package_doc(name):
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
+          'Programming Language :: Python :: 3.11',
           'Topic :: Software Development',
-          'Topic :: System :: Systems Administration :: '
-          'Authentication/Directory',
+          'Topic :: System :: Systems Administration :: Authentication/Directory',  # noqa: E501 line too long
       ],
       keywords='web application server zope',
       author='Zope Foundation and Contributors',
diff --git a/tox.ini b/tox.ini
index a74754a..bbf35d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,7 @@ envlist =
     py38
     py39
     py310
+    py311
     docs
     coverage
     py27-zserver
@@ -19,7 +20,7 @@ envlist =
 [testenv]
 skip_install = true
 deps =
-    zc.buildout >= 3.0.0rc3
+    zc.buildout >= 3.0.1
     wheel > 0.37
 commands_pre =
     py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test