Add support for Python 3.10.

.github/workflows/tests.yml

@@ -22,16 +22,16 @@ jobs:
         config:
         # [Python version, tox env]
         - ["3.8",   "lint"]
-        - ["3.6",   "py36"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
+        - ["3.10",  "py310"]
         - ["3.8",   "docs"]
         - ["3.8",   "coverage"]
         exclude:
-          - { os: windows, config: ["3.8",   "lint"] }
-          - { os: windows, config: ["3.8",   "docs"] }
-          - { os: windows, config: ["3.8",   "coverage"] }
+          - { os: windows, config: ["3.9",   "lint"] }
+          - { os: windows, config: ["3.9",   "docs"] }
+          - { os: windows, config: ["3.9",   "coverage"] }
 
     runs-on: ${{ matrix.os }}-latest
     name: ${{ matrix.os }}-${{ matrix.config[1] }}

.gitignore

@@ -1,9 +1,11 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
+*.dll
 *.egg-info/
 *.profraw
 *.pyc
 *.pyo
+*.so
 .coverage
 .coverage.*
 .eggs/

.meta.toml

@@ -2,15 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "10891b6cf9212ecd48f9bc70138aa14324d6a2b0"
+commit-id = "4f26ce7365213cb7beb6acb80d44959b69b68c2e"
 
 [python]
-with-appveyor = false
 with-pypy = false
 with-legacy-python = false
 with-docs = true
 with-sphinx-doctests = false
 with-windows = true
+with-future-python = false
 
 [coverage]
 fail-under = 80
@@ -29,6 +29,9 @@ additional-config = [
     ]
 
 [tox]
+testenv-deps = [
+    "wheel",
+    ]
 additional-envlist = [
     "pre-commit",
     ]

CHANGES.rst

@@ -8,8 +8,12 @@ The change log for the previous version, Zope 4, is at
 https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 
 
-5.3.1 (unreleased)
-------------------
+5.4 (unreleased)
+----------------
+
+- Add support for Python 3.10.
+
+- Drop support for Python 3.6.
 
 - Update to newest compatible versions of dependencies.
 

setup.py

@@ -29,7 +29,7 @@ def _read_file(filename):
 README = _read_file('README.rst')
 CHANGES = _read_file('CHANGES.rst')
 
-version = '5.3.1.dev0'
+version = '5.4.dev0'
 
 
 setup(
@@ -55,10 +55,10 @@ def _read_file(filename):
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
@@ -67,7 +67,7 @@ def _read_file(filename):
     packages=find_packages('src'),
     namespace_packages=['Products', 'Shared', 'Shared.DC', 'zmi'],
     package_dir={'': 'src'},
-    python_requires='>= 3.6',
+    python_requires='>= 3.7',
     install_requires=[
         'AccessControl >= 5.2',
         'Acquisition',

tox.ini

@@ -4,10 +4,10 @@
 minversion = 3.18
 envlist =
     lint
-    py36
     py37
     py38
     py39
+    py310
     docs
     coverage
     pre-commit
@@ -18,6 +18,7 @@ skip_install = true
 deps =
     setuptools < 52
     zc.buildout
+    wheel
 commands_pre =
     {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install alltests
 commands =
@@ -79,8 +80,6 @@ commands =
 [testenv:docs]
 basepython = python3
 skip_install = false
-# Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
-deps = Sphinx < 4
 extras =
     docs
 commands_pre =

versions-prod.cfg

@@ -48,7 +48,7 @@ z3c.pt = 3.3.0
 zExceptions = 4.1
 zc.lockfile = 2.0
 zdaemon = 4.3
-zodbpickle = 2.0.0
+zodbpickle = 2.2.0
 zope.annotation = 4.7.0
 zope.browser = 2.3
 zope.browsermenu = 4.4