Add support for Python 3.10. (#988)

* Update to current versions. Co-authored-by: Jens Vagelpohl <[email protected]>
zopefoundation · Nov 19, 2021 · adacc41 · adacc41
1 parent c1a3e7c
commit adacc41
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 104 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,17 +21,18 @@ jobs:
         - windows
         config:
         # [Python version, tox env]
-        - ["3.8",   "lint"]
+        - ["3.9",   "lint"]
         - ["3.6",   "py36"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
-        - ["3.8",   "docs"]
-        - ["3.8",   "coverage"]
+        - ["3.10",  "py310"]
+        - ["3.9",   "docs"]
+        - ["3.9",   "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] }}

diff --git a/.gitignore b/.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/

diff --git a/.meta.toml b/.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 = "4b216b8aa60ef769d82827f7087507800a468972"
 
 [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",
     ]

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,8 +8,10 @@ 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.
 
 - Update to newest compatible versions of dependencies.
 

diff --git a/constraints.txt b/constraints.txt
@@ -1,5 +1,5 @@
 AccessControl==5.2
-Acquisition==4.8
+Acquisition==4.9
 AuthEncoding==4.3
 BTrees==4.9.2
 Chameleon==3.9.1
@@ -12,38 +12,38 @@ Paste==3.5.0
 PasteDeploy==2.1.1
 Persistence==3.1
 Products.BTreeFolder2==4.3
-Products.ZCatalog==6.0
+Products.ZCatalog==6.1
 Record==3.5
-RestrictedPython==5.1
+RestrictedPython==5.2
 SecretStorage==3.3.1
-WSGIProxy2==0.4.6
+WSGIProxy2==0.5.1
 WebOb==1.8.7
-WebTest==2.0.35
+WebTest==3.0.0
 ZConfig==3.6.0
-ZEO==5.2.2
+ZEO==5.2.3
 ZODB==5.6.0
 Zope2==4.0
-cryptography==3.4.7
+cryptography==35.0.0
 five.localsitemanager==3.2.2
 funcsigs==1.0.2
 future==0.18.2
 ipaddress==1.0.23
 jeepney==0.7.1
 mock==4.0.3
 multipart==0.2.4
-pbr==5.6.0
+pbr==5.8.0
 persistent==4.7.0
-pytz==2021.1
+pytz==2021.3
 roman==3.3
 shutilwhich==1.1.0
 six==1.16.0
 transaction==3.0.1
 waitress==2.0.0
 z3c.pt==3.3.0
-zExceptions==4.1
+zExceptions==4.2
 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
@@ -63,31 +63,31 @@ zope.dottedname==4.3
 zope.event==4.5.0
 zope.exceptions==4.4
 zope.filerepresentation==5.0.0
-zope.formlib==4.7.1
+zope.formlib==5.0.1
 zope.globalrequest==1.5
 zope.hookable==5.1.0
 zope.i18n==4.8.0
 zope.i18nmessageid==5.0.1
 zope.interface==5.4.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
-zope.pagetemplate==4.5.0
+zope.pagetemplate==4.6.0
 zope.processlifetime==2.3.0
-zope.proxy==4.4.0
+zope.proxy==4.5.0
 zope.ptresource==4.2.0
 zope.publisher==6.0.2
 zope.ramcache==2.3
-zope.schema==6.1.0
+zope.schema==6.2.0
 zope.security==5.1.1
 zope.sendmail==5.2
-zope.sequencesort==4.1.2
+zope.sequencesort==4.2
 zope.site==4.5.0
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.5
 zope.tales==5.1
 zope.testbrowser==5.5.1
 zope.testing==4.9
-zope.testrunner==5.3.0
+zope.testrunner==5.4.0
 zope.traversing==4.4.1
 zope.viewlet==4.2.1
diff --git a/requirements-full.txt b/requirements-full.txt
@@ -1,6 +1,6 @@
 -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
 AccessControl==5.2
-Acquisition==4.8
+Acquisition==4.9
 AuthEncoding==4.3
 BTrees==4.9.2
 Chameleon==3.9.1
@@ -13,38 +13,38 @@ Paste==3.5.0
 PasteDeploy==2.1.1
 Persistence==3.1
 Products.BTreeFolder2==4.3
-Products.ZCatalog==6.0
+Products.ZCatalog==6.1
 Record==3.5
-RestrictedPython==5.1
+RestrictedPython==5.2
 SecretStorage==3.3.1
-WSGIProxy2==0.4.6
+WSGIProxy2==0.5.1
 WebOb==1.8.7
-WebTest==2.0.35
+WebTest==3.0.0
 ZConfig==3.6.0
-ZEO==5.2.2
+ZEO==5.2.3
 ZODB==5.6.0
 Zope2==4.0
-cryptography==3.4.7
+cryptography==35.0.0
 five.localsitemanager==3.2.2
 funcsigs==1.0.2
 future==0.18.2
 ipaddress==1.0.23
 jeepney==0.7.1
 mock==4.0.3
 multipart==0.2.4
-pbr==5.6.0
+pbr==5.8.0
 persistent==4.7.0
-pytz==2021.1
+pytz==2021.3
 roman==3.3
 shutilwhich==1.1.0
 six==1.16.0
 transaction==3.0.1
 waitress==2.0.0
 z3c.pt==3.3.0
-zExceptions==4.1
+zExceptions==4.2
 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
@@ -64,31 +64,31 @@ zope.dottedname==4.3
 zope.event==4.5.0
 zope.exceptions==4.4
 zope.filerepresentation==5.0.0
-zope.formlib==4.7.1
+zope.formlib==5.0.1
 zope.globalrequest==1.5
 zope.hookable==5.1.0
 zope.i18n==4.8.0
 zope.i18nmessageid==5.0.1
 zope.interface==5.4.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
-zope.pagetemplate==4.5.0
+zope.pagetemplate==4.6.0
 zope.processlifetime==2.3.0
-zope.proxy==4.4.0
+zope.proxy==4.5.0
 zope.ptresource==4.2.0
 zope.publisher==6.0.2
 zope.ramcache==2.3
-zope.schema==6.1.0
+zope.schema==6.2.0
 zope.security==5.1.1
 zope.sendmail==5.2
-zope.sequencesort==4.1.2
+zope.sequencesort==4.2
 zope.site==4.5.0
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.5
 zope.tales==5.1
 zope.testbrowser==5.5.1
 zope.testing==4.9
-zope.testrunner==5.3.0
+zope.testrunner==5.4.0
 zope.traversing==4.4.1
 zope.viewlet==4.2.1
diff --git a/setup.py b/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(
@@ -59,6 +59,7 @@ def _read_file(filename):
         "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",

diff --git a/tox.ini b/tox.ini
@@ -8,6 +8,7 @@ envlist =
     py37
     py38
     py39
+    py310
     docs
     coverage
     pre-commit
@@ -18,6 +19,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 +81,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 =

diff --git a/versions-prod.cfg b/versions-prod.cfg
@@ -5,7 +5,7 @@
 Zope =
 Zope2 = 4.0
 AccessControl = 5.2
-Acquisition = 4.8
+Acquisition = 4.9
 AuthEncoding = 4.3
 BTrees = 4.9.2
 Chameleon = 3.9.1
@@ -18,34 +18,34 @@ Paste = 3.5.0
 PasteDeploy = 2.1.1
 Persistence = 3.1
 Products.BTreeFolder2 = 4.3
-Products.ZCatalog = 6.0
+Products.ZCatalog = 6.1
 Record = 3.5
-RestrictedPython = 5.1
+RestrictedPython = 5.2
 SecretStorage = 3.3.1
-WSGIProxy2 = 0.4.6
+WSGIProxy2 = 0.5.1
 WebOb = 1.8.7
-WebTest = 2.0.35
+WebTest = 3.0.0
 ZConfig = 3.6.0
-ZEO = 5.2.2
+ZEO = 5.2.3
 ZODB = 5.6.0
-cryptography = 3.4.7
+cryptography = 35.0.0
 five.localsitemanager = 3.2.2
 funcsigs = 1.0.2
 future = 0.18.2
 ipaddress = 1.0.23
 jeepney = 0.7.1
 mock = 4.0.3
 multipart = 0.2.4
-pbr = 5.6.0
+pbr = 5.8.0
 persistent = 4.7.0
-pytz = 2021.1
+pytz = 2021.3
 roman = 3.3
 shutilwhich = 1.1.0
 six = 1.16.0
 transaction = 3.0.1
 waitress = 2.0.0
 z3c.pt = 3.3.0
-zExceptions = 4.1
+zExceptions = 4.2
 zc.lockfile = 2.0
 zdaemon = 4.3
 zodbpickle = 2.2.0
@@ -68,31 +68,31 @@ zope.dottedname = 4.3
 zope.event = 4.5.0
 zope.exceptions = 4.4
 zope.filerepresentation = 5.0.0
-zope.formlib = 4.7.1
+zope.formlib = 5.0.1
 zope.globalrequest = 1.5
 zope.hookable = 5.1.0
 zope.i18n = 4.8.0
 zope.i18nmessageid = 5.0.1
 zope.interface = 5.4.0
 zope.lifecycleevent = 4.3.0
 zope.location = 4.2
-zope.pagetemplate = 4.5.0
+zope.pagetemplate = 4.6.0
 zope.processlifetime = 2.3.0
-zope.proxy = 4.4.0
+zope.proxy = 4.5.0
 zope.ptresource = 4.2.0
 zope.publisher = 6.0.2
 zope.ramcache = 2.3
-zope.schema = 6.1.0
+zope.schema = 6.2.0
 zope.security = 5.1.1
 zope.sendmail = 5.2
-zope.sequencesort = 4.1.2
+zope.sequencesort = 4.2
 zope.site = 4.5.0
 zope.size = 4.3
 zope.structuredtext = 4.3
 zope.tal = 4.5
 zope.tales = 5.1
 zope.testbrowser = 5.5.1
 zope.testing = 4.9
-zope.testrunner = 5.3.0
+zope.testrunner = 5.4.0
 zope.traversing = 4.4.1
 zope.viewlet = 4.2.1