Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Officially support Python 3.12. #1184

Merged
merged 2 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
[meta]
template = "zope-product"
commit-id = "6f8d8c51"
commit-id = "cb0568c7"

[python]
with-pypy = false
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
Allows administrators to fix
`#1171 <https://github.com/zopefoundation/Zope/pull/1171>`_.

- Officially support Python 3.12.


5.8.6 (2023-10-04)
------------------
Expand Down
19 changes: 7 additions & 12 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
AccessControl==6.2
AccessControl==6.3
Acquisition==5.1
AuthEncoding==5.0
BTrees==5.1
Chameleon==4.2.0
DateTime==5.2
DocumentTemplate==4.5
DateTime==5.3
DocumentTemplate==4.6
ExtensionClass==5.1
MultiMapping==5.0
Paste==3.6.0
Paste==3.7.1
PasteDeploy==2.1.1; python_version == '3.7'
PasteDeploy==3.0.1; python_version > '3.7'
PasteDeploy==3.1.0; python_version > '3.7'
Persistence==4.1
RestrictedPython==6.2; python_version == '3.10'
RestrictedPython==6.2; python_version == '3.11'
RestrictedPython==6.2; python_version == '3.7'
RestrictedPython==6.2; python_version == '3.8'
RestrictedPython==6.2; python_version == '3.9'
RestrictedPython==7.0a2.dev0; python_version > '3.11'
RestrictedPython==7.0
WSGIProxy2==0.5.1
WebOb==1.8.7
WebTest==3.0.0
Expand All @@ -35,7 +30,7 @@ roman==4.1
six==1.16.0
soupsieve==2.4.1; python_version == '3.7'
soupsieve==2.5; python_version > '3.7'
transaction==3.1.0
transaction==4.0
waitress==2.1.2
z3c.pt==4.0
zExceptions==5.0
Expand Down
19 changes: 7 additions & 12 deletions requirements-full.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
-e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
AccessControl==6.2
AccessControl==6.3
Acquisition==5.1
AuthEncoding==5.0
BTrees==5.1
Chameleon==4.2.0
DateTime==5.2
DocumentTemplate==4.5
DateTime==5.3
DocumentTemplate==4.6
ExtensionClass==5.1
MultiMapping==5.0
Paste==3.6.0
Paste==3.7.1
PasteDeploy==2.1.1; python_version == '3.7'
PasteDeploy==3.0.1; python_version > '3.7'
PasteDeploy==3.1.0; python_version > '3.7'
Persistence==4.1
RestrictedPython==6.2; python_version == '3.10'
RestrictedPython==6.2; python_version == '3.11'
RestrictedPython==6.2; python_version == '3.7'
RestrictedPython==6.2; python_version == '3.8'
RestrictedPython==6.2; python_version == '3.9'
RestrictedPython==7.0a2.dev0; python_version > '3.11'
RestrictedPython==7.0
WSGIProxy2==0.5.1
WebOb==1.8.7
WebTest==3.0.0
Expand All @@ -36,7 +31,7 @@ roman==4.1
six==1.16.0
soupsieve==2.4.1; python_version == '3.7'
soupsieve==2.5; python_version > '3.7'
transaction==3.1.0
transaction==4.0
waitress==2.1.2
z3c.pt==4.0
zExceptions==5.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ def _read_file(filename):
author_email='[email protected]',
long_description="\n\n".join([README, CHANGES]),
classifiers=[
'Development Status :: 6 - Mature',
"Development Status :: 6 - Mature",
"Environment :: Web Environment",
"Framework :: Zope :: 5",
"Intended Audience :: Developers",
"License :: OSI Approved :: Zope Public License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
Expand Down
32 changes: 7 additions & 25 deletions versions-prod.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
[versions]
Zope =
Zope2 = 4.0
AccessControl = 6.2
AccessControl = 6.3
Acquisition = 5.1
AuthEncoding = 5.0
BTrees = 5.1
Chameleon = 4.2.0
DateTime = 5.2
DocumentTemplate = 4.5
DateTime = 5.3
DocumentTemplate = 4.6
ExtensionClass = 5.1
MultiMapping = 5.0
Paste = 3.6.0
PasteDeploy = 3.0.1
Paste = 3.7.1
PasteDeploy = 3.1.0
Persistence = 4.1
RestrictedPython = 7.0a2.dev0
RestrictedPython = 7.0
WebTest = 3.0.0
WSGIProxy2 = 0.5.1
WebOb = 1.8.7
Expand All @@ -32,7 +32,7 @@ pytz = 2023.3.post1
six = 1.16.0
roman = 4.1
soupsieve = 2.5
transaction = 3.1.0
transaction = 4.0
waitress = 2.1.2
z3c.pt = 4.0
zExceptions = 5.0
Expand Down Expand Up @@ -87,23 +87,5 @@ zope.viewlet = 5.0
PasteDeploy = 2.1.1
# SoupSieve 2.5 and up requires Python 3.8
soupsieve = 2.4.1
# Only use dev version on Python 3.12 + 3.13
RestrictedPython = 6.2
# cffi 1.16.0 requires Python 3.8
cffi = 1.15.1

[versions:python38]
# Only use dev version on Python 3.12 + 3.13
RestrictedPython = 6.2

[versions:python39]
# Only use dev version on Python 3.12 + 3.13
RestrictedPython = 6.2

[versions:python310]
# Only use dev version on Python 3.12 + 3.13
RestrictedPython = 6.2

[versions:python311]
# Only use dev version on Python 3.12 + 3.13
RestrictedPython = 6.2
14 changes: 8 additions & 6 deletions versions.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ versions = versions

[versions]
# Version pins for development and optional dependencies.
Babel = 2.13.0
Babel = 2.13.1
Jinja2 = 3.1.2
Missing = 5.0
MarkupSafe = 2.1.3
Products.BTreeFolder2 = 5.1
Products.ZCatalog = 7.0
Pygments = 2.16.1
Pygments = 2.17.2
Record = 4.0
Sphinx = 7.2.6
alabaster = 0.7.13
certifi = 2023.7.22
charset-normalizer = 3.3.0
certifi = 2023.11.17
charset-normalizer = 3.3.2
collective.recipe.template = 2.2
colorama = 0.4.6
# sphinx-rtd-theme 1.3.0 requires docutils<19
Expand All @@ -39,11 +39,11 @@ sphinxcontrib-jsmath = 1.0.1
sphinxcontrib-qthelp = 1.0.6
sphinxcontrib-serializinghtml = 1.1.9
tempstorage = 6.0
urllib3 = 2.0.6
urllib3 = 2.1.0
z3c.checkversions = 2.1
zc.recipe.testrunner = 3.0
zipp = 3.17.0
zope.testrunner = 6.1
zope.testrunner = 6.2

[versions:python38]
# Sphinx >= 7.2 requires Python 3.9+
Expand Down Expand Up @@ -76,5 +76,7 @@ sphinxcontrib-htmlhelp = 2.0.0
sphinxcontrib-devhelp = 1.0.2
# sphinxcontrib-applehelp >= 1.0.3 requires Python 3.8+
sphinxcontrib-applehelp = 1.0.2
# urllib3 > 2.1.0 requires Python 3.8+
urllib3 = 2.0.7
# zipp >= 3.16 requires Python 3.8+
zipp = 3.15
Loading