- prepare release 4.13 with Python 3.11 support and test fixes.

.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,18 +28,20 @@ jobs:
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
+        - ["3.11",  "py311"]
         - ["3.9",   "coverage"]
 
-    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') }}

.gitignore

@@ -28,4 +28,5 @@ lib64
 log/
 parts/
 pyvenv.cfg
+testing.log
 var/

.meta.toml

@@ -2,14 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "efa4b7532073de2e151785892b48ac95bc72981b"
+commit-id = "d6240444ec6c9e203f2fd9f62c3e6038f9189e96"
 
 [python]
 with-pypy = false
 with-legacy-python = true
 with-sphinx-doctests = false
 with-windows = false
 with-future-python = false
+with-macos = false
 
 [coverage]
 fail-under = 83

CHANGES.rst

@@ -1,10 +1,12 @@
 Changelog
 =========
 
-4.13 (unreleased)
+4.13 (2022-12-16)
 -----------------
 
-- Nothing changed yet.
+- Fix insidious buildout configuration bug for tests against Zope 4.
+
+- Add support for Python 3.11.
 
 
 4.12 (2022-03-30)

buildout.cfg

@@ -5,7 +5,6 @@ develop = .
 parts =
     test
     test_with_gs
-    tox
 
 [versions]
 Products.MailHost =

buildout4.cfg

@@ -2,3 +2,6 @@
 extends =
     buildout.cfg
     https://zopefoundation.github.io/Zope/releases/4.x/versions.cfg
+
+[versions]
+Products.MailHost =

setup.py

@@ -23,7 +23,7 @@ def _read(fname):
 
 setup(
     name='Products.MailHost',
-    version='4.13.dev0',
+    version='4.13',
     url='https://github.com/zopefoundation/Products.MailHost',
     project_urls={
         'Issue Tracker': ('https://github.com/zopefoundation'
@@ -56,6 +56,7 @@ def _read(fname):
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Communications :: Email',
     ],

tox.ini

@@ -11,14 +11,13 @@ envlist =
     py38
     py39
     py310
+    py311
     coverage
 
 [testenv]
 skip_install = true
-# We need to pin setuptools < 60 until zc.buildout 3.x supports it.
 deps =
-    setuptools < 60
-    zc.buildout==3.0.0rc2
+    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 test_with_gs