Skip to content

Commit adacc41

Browse files
Michael Howitzdataflake
Michael Howitz
and
dataflake
authored
Add support for Python 3.10. (#988)
* Update to current versions. Co-authored-by: Jens Vagelpohl <[email protected]>
1 parent c1a3e7c commit adacc41

10 files changed

+113
-104
lines changed

‎.github/workflows/tests.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@ jobs:
2121
- windows
2222
config:
2323
# [Python version, tox env]
24-
- ["3.8", "lint"]
24+
- ["3.9", "lint"]
2525
- ["3.6", "py36"]
2626
- ["3.7", "py37"]
2727
- ["3.8", "py38"]
2828
- ["3.9", "py39"]
29-
- ["3.8", "docs"]
30-
- ["3.8", "coverage"]
29+
- ["3.10", "py310"]
30+
- ["3.9", "docs"]
31+
- ["3.9", "coverage"]
3132
exclude:
32-
- { os: windows, config: ["3.8", "lint"] }
33-
- { os: windows, config: ["3.8", "docs"] }
34-
- { os: windows, config: ["3.8", "coverage"] }
33+
- { os: windows, config: ["3.9", "lint"] }
34+
- { os: windows, config: ["3.9", "docs"] }
35+
- { os: windows, config: ["3.9", "coverage"] }
3536

3637
runs-on: ${{ matrix.os }}-latest
3738
name: ${{ matrix.os }}-${{ matrix.config[1] }}

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Generated from:
22
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
3+
*.dll
34
*.egg-info/
45
*.profraw
56
*.pyc
67
*.pyo
8+
*.so
79
.coverage
810
.coverage.*
911
.eggs/

‎.meta.toml

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
33
[meta]
44
template = "zope-product"
5-
commit-id = "10891b6cf9212ecd48f9bc70138aa14324d6a2b0"
5+
commit-id = "4b216b8aa60ef769d82827f7087507800a468972"
66

77
[python]
8-
with-appveyor = false
98
with-pypy = false
109
with-legacy-python = false
1110
with-docs = true
1211
with-sphinx-doctests = false
1312
with-windows = true
13+
with-future-python = false
1414

1515
[coverage]
1616
fail-under = 80
@@ -29,6 +29,9 @@ additional-config = [
2929
]
3030

3131
[tox]
32+
testenv-deps = [
33+
"wheel",
34+
]
3235
additional-envlist = [
3336
"pre-commit",
3437
]

‎CHANGES.rst

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ The change log for the previous version, Zope 4, is at
88
https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
99

1010

11-
5.3.1 (unreleased)
12-
------------------
11+
5.4 (unreleased)
12+
----------------
13+
14+
- Add support for Python 3.10.
1315

1416
- Update to newest compatible versions of dependencies.
1517

‎constraints.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AccessControl==5.2
2-
Acquisition==4.8
2+
Acquisition==4.9
33
AuthEncoding==4.3
44
BTrees==4.9.2
55
Chameleon==3.9.1
@@ -12,38 +12,38 @@ Paste==3.5.0
1212
PasteDeploy==2.1.1
1313
Persistence==3.1
1414
Products.BTreeFolder2==4.3
15-
Products.ZCatalog==6.0
15+
Products.ZCatalog==6.1
1616
Record==3.5
17-
RestrictedPython==5.1
17+
RestrictedPython==5.2
1818
SecretStorage==3.3.1
19-
WSGIProxy2==0.4.6
19+
WSGIProxy2==0.5.1
2020
WebOb==1.8.7
21-
WebTest==2.0.35
21+
WebTest==3.0.0
2222
ZConfig==3.6.0
23-
ZEO==5.2.2
23+
ZEO==5.2.3
2424
ZODB==5.6.0
2525
Zope2==4.0
26-
cryptography==3.4.7
26+
cryptography==35.0.0
2727
five.localsitemanager==3.2.2
2828
funcsigs==1.0.2
2929
future==0.18.2
3030
ipaddress==1.0.23
3131
jeepney==0.7.1
3232
mock==4.0.3
3333
multipart==0.2.4
34-
pbr==5.6.0
34+
pbr==5.8.0
3535
persistent==4.7.0
36-
pytz==2021.1
36+
pytz==2021.3
3737
roman==3.3
3838
shutilwhich==1.1.0
3939
six==1.16.0
4040
transaction==3.0.1
4141
waitress==2.0.0
4242
z3c.pt==3.3.0
43-
zExceptions==4.1
43+
zExceptions==4.2
4444
zc.lockfile==2.0
4545
zdaemon==4.3
46-
zodbpickle==2.0.0
46+
zodbpickle==2.2.0
4747
zope.annotation==4.7.0
4848
zope.browser==2.3
4949
zope.browsermenu==4.4
@@ -63,31 +63,31 @@ zope.dottedname==4.3
6363
zope.event==4.5.0
6464
zope.exceptions==4.4
6565
zope.filerepresentation==5.0.0
66-
zope.formlib==4.7.1
66+
zope.formlib==5.0.1
6767
zope.globalrequest==1.5
6868
zope.hookable==5.1.0
6969
zope.i18n==4.8.0
7070
zope.i18nmessageid==5.0.1
7171
zope.interface==5.4.0
7272
zope.lifecycleevent==4.3.0
7373
zope.location==4.2
74-
zope.pagetemplate==4.5.0
74+
zope.pagetemplate==4.6.0
7575
zope.processlifetime==2.3.0
76-
zope.proxy==4.4.0
76+
zope.proxy==4.5.0
7777
zope.ptresource==4.2.0
7878
zope.publisher==6.0.2
7979
zope.ramcache==2.3
80-
zope.schema==6.1.0
80+
zope.schema==6.2.0
8181
zope.security==5.1.1
8282
zope.sendmail==5.2
83-
zope.sequencesort==4.1.2
83+
zope.sequencesort==4.2
8484
zope.site==4.5.0
8585
zope.size==4.3
8686
zope.structuredtext==4.3
8787
zope.tal==4.5
8888
zope.tales==5.1
8989
zope.testbrowser==5.5.1
9090
zope.testing==4.9
91-
zope.testrunner==5.3.0
91+
zope.testrunner==5.4.0
9292
zope.traversing==4.4.1
9393
zope.viewlet==4.2.1

‎requirements-full.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
22
AccessControl==5.2
3-
Acquisition==4.8
3+
Acquisition==4.9
44
AuthEncoding==4.3
55
BTrees==4.9.2
66
Chameleon==3.9.1
@@ -13,38 +13,38 @@ Paste==3.5.0
1313
PasteDeploy==2.1.1
1414
Persistence==3.1
1515
Products.BTreeFolder2==4.3
16-
Products.ZCatalog==6.0
16+
Products.ZCatalog==6.1
1717
Record==3.5
18-
RestrictedPython==5.1
18+
RestrictedPython==5.2
1919
SecretStorage==3.3.1
20-
WSGIProxy2==0.4.6
20+
WSGIProxy2==0.5.1
2121
WebOb==1.8.7
22-
WebTest==2.0.35
22+
WebTest==3.0.0
2323
ZConfig==3.6.0
24-
ZEO==5.2.2
24+
ZEO==5.2.3
2525
ZODB==5.6.0
2626
Zope2==4.0
27-
cryptography==3.4.7
27+
cryptography==35.0.0
2828
five.localsitemanager==3.2.2
2929
funcsigs==1.0.2
3030
future==0.18.2
3131
ipaddress==1.0.23
3232
jeepney==0.7.1
3333
mock==4.0.3
3434
multipart==0.2.4
35-
pbr==5.6.0
35+
pbr==5.8.0
3636
persistent==4.7.0
37-
pytz==2021.1
37+
pytz==2021.3
3838
roman==3.3
3939
shutilwhich==1.1.0
4040
six==1.16.0
4141
transaction==3.0.1
4242
waitress==2.0.0
4343
z3c.pt==3.3.0
44-
zExceptions==4.1
44+
zExceptions==4.2
4545
zc.lockfile==2.0
4646
zdaemon==4.3
47-
zodbpickle==2.0.0
47+
zodbpickle==2.2.0
4848
zope.annotation==4.7.0
4949
zope.browser==2.3
5050
zope.browsermenu==4.4
@@ -64,31 +64,31 @@ zope.dottedname==4.3
6464
zope.event==4.5.0
6565
zope.exceptions==4.4
6666
zope.filerepresentation==5.0.0
67-
zope.formlib==4.7.1
67+
zope.formlib==5.0.1
6868
zope.globalrequest==1.5
6969
zope.hookable==5.1.0
7070
zope.i18n==4.8.0
7171
zope.i18nmessageid==5.0.1
7272
zope.interface==5.4.0
7373
zope.lifecycleevent==4.3.0
7474
zope.location==4.2
75-
zope.pagetemplate==4.5.0
75+
zope.pagetemplate==4.6.0
7676
zope.processlifetime==2.3.0
77-
zope.proxy==4.4.0
77+
zope.proxy==4.5.0
7878
zope.ptresource==4.2.0
7979
zope.publisher==6.0.2
8080
zope.ramcache==2.3
81-
zope.schema==6.1.0
81+
zope.schema==6.2.0
8282
zope.security==5.1.1
8383
zope.sendmail==5.2
84-
zope.sequencesort==4.1.2
84+
zope.sequencesort==4.2
8585
zope.site==4.5.0
8686
zope.size==4.3
8787
zope.structuredtext==4.3
8888
zope.tal==4.5
8989
zope.tales==5.1
9090
zope.testbrowser==5.5.1
9191
zope.testing==4.9
92-
zope.testrunner==5.3.0
92+
zope.testrunner==5.4.0
9393
zope.traversing==4.4.1
9494
zope.viewlet==4.2.1

‎setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def _read_file(filename):
2929
README = _read_file('README.rst')
3030
CHANGES = _read_file('CHANGES.rst')
3131

32-
version = '5.3.1.dev0'
32+
version = '5.4.dev0'
3333

3434

3535
setup(
@@ -59,6 +59,7 @@ def _read_file(filename):
5959
"Programming Language :: Python :: 3.7",
6060
"Programming Language :: Python :: 3.8",
6161
"Programming Language :: Python :: 3.9",
62+
"Programming Language :: Python :: 3.10",
6263
"Programming Language :: Python :: Implementation :: CPython",
6364
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
6465
"Topic :: Internet :: WWW/HTTP :: WSGI :: Application",

‎tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ envlist =
88
py37
99
py38
1010
py39
11+
py310
1112
docs
1213
coverage
1314
pre-commit
@@ -18,6 +19,7 @@ skip_install = true
1819
deps =
1920
setuptools < 52
2021
zc.buildout
22+
wheel
2123
commands_pre =
2224
{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install alltests
2325
commands =
@@ -79,8 +81,6 @@ commands =
7981
[testenv:docs]
8082
basepython = python3
8183
skip_install = false
82-
# Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
83-
deps = Sphinx < 4
8484
extras =
8585
docs
8686
commands_pre =

‎versions-prod.cfg

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Zope =
66
Zope2 = 4.0
77
AccessControl = 5.2
8-
Acquisition = 4.8
8+
Acquisition = 4.9
99
AuthEncoding = 4.3
1010
BTrees = 4.9.2
1111
Chameleon = 3.9.1
@@ -18,34 +18,34 @@ Paste = 3.5.0
1818
PasteDeploy = 2.1.1
1919
Persistence = 3.1
2020
Products.BTreeFolder2 = 4.3
21-
Products.ZCatalog = 6.0
21+
Products.ZCatalog = 6.1
2222
Record = 3.5
23-
RestrictedPython = 5.1
23+
RestrictedPython = 5.2
2424
SecretStorage = 3.3.1
25-
WSGIProxy2 = 0.4.6
25+
WSGIProxy2 = 0.5.1
2626
WebOb = 1.8.7
27-
WebTest = 2.0.35
27+
WebTest = 3.0.0
2828
ZConfig = 3.6.0
29-
ZEO = 5.2.2
29+
ZEO = 5.2.3
3030
ZODB = 5.6.0
31-
cryptography = 3.4.7
31+
cryptography = 35.0.0
3232
five.localsitemanager = 3.2.2
3333
funcsigs = 1.0.2
3434
future = 0.18.2
3535
ipaddress = 1.0.23
3636
jeepney = 0.7.1
3737
mock = 4.0.3
3838
multipart = 0.2.4
39-
pbr = 5.6.0
39+
pbr = 5.8.0
4040
persistent = 4.7.0
41-
pytz = 2021.1
41+
pytz = 2021.3
4242
roman = 3.3
4343
shutilwhich = 1.1.0
4444
six = 1.16.0
4545
transaction = 3.0.1
4646
waitress = 2.0.0
4747
z3c.pt = 3.3.0
48-
zExceptions = 4.1
48+
zExceptions = 4.2
4949
zc.lockfile = 2.0
5050
zdaemon = 4.3
5151
zodbpickle = 2.2.0
@@ -68,31 +68,31 @@ zope.dottedname = 4.3
6868
zope.event = 4.5.0
6969
zope.exceptions = 4.4
7070
zope.filerepresentation = 5.0.0
71-
zope.formlib = 4.7.1
71+
zope.formlib = 5.0.1
7272
zope.globalrequest = 1.5
7373
zope.hookable = 5.1.0
7474
zope.i18n = 4.8.0
7575
zope.i18nmessageid = 5.0.1
7676
zope.interface = 5.4.0
7777
zope.lifecycleevent = 4.3.0
7878
zope.location = 4.2
79-
zope.pagetemplate = 4.5.0
79+
zope.pagetemplate = 4.6.0
8080
zope.processlifetime = 2.3.0
81-
zope.proxy = 4.4.0
81+
zope.proxy = 4.5.0
8282
zope.ptresource = 4.2.0
8383
zope.publisher = 6.0.2
8484
zope.ramcache = 2.3
85-
zope.schema = 6.1.0
85+
zope.schema = 6.2.0
8686
zope.security = 5.1.1
8787
zope.sendmail = 5.2
88-
zope.sequencesort = 4.1.2
88+
zope.sequencesort = 4.2
8989
zope.site = 4.5.0
9090
zope.size = 4.3
9191
zope.structuredtext = 4.3
9292
zope.tal = 4.5
9393
zope.tales = 5.1
9494
zope.testbrowser = 5.5.1
9595
zope.testing = 4.9
96-
zope.testrunner = 5.3.0
96+
zope.testrunner = 5.4.0
9797
zope.traversing = 4.4.1
9898
zope.viewlet = 4.2.1

0 commit comments

Comments
 (0)