diff --git a/constraints.txt b/constraints.txt index c13d5b7232..420f962f9c 100644 --- a/constraints.txt +++ b/constraints.txt @@ -11,7 +11,12 @@ Paste==3.5.3 PasteDeploy==2.1.1; python_version == '3.7' PasteDeploy==3.0.1; python_version > '3.7' Persistence==4.0.post1 -RestrictedPython==6.2 +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.0a1.dev1; python_version > '3.11' WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 @@ -46,7 +51,7 @@ zope.component==6.0 zope.configuration==5.0 zope.container==5.1 zope.contentprovider==5.0 -zope.contenttype==5.0 +zope.contenttype==5.1 zope.datetime==5.0.0 zope.deferredimport==5.0 zope.deprecation==5.0 diff --git a/requirements-full.txt b/requirements-full.txt index b07ab70ae4..85341567a5 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -12,7 +12,12 @@ Paste==3.5.3 PasteDeploy==2.1.1; python_version == '3.7' PasteDeploy==3.0.1; python_version > '3.7' Persistence==4.0.post1 -RestrictedPython==6.2 +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.0a1.dev1; python_version > '3.11' WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 @@ -47,7 +52,7 @@ zope.component==6.0 zope.configuration==5.0 zope.container==5.1 zope.contentprovider==5.0 -zope.contenttype==5.0 +zope.contenttype==5.1 zope.datetime==5.0.0 zope.deferredimport==5.0 zope.deprecation==5.0 diff --git a/util.py b/util.py index 52aa6aa82a..3157c3faf7 100644 --- a/util.py +++ b/util.py @@ -27,7 +27,7 @@ def generate(in_, requirements_file, constraints_file): '-e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope\n') # Try to include sections for all currently supported Python versions - for py_version in ('3.7', '3.8', '3.9', '3.10', '3.11'): + for py_version in ('3.7', '3.8', '3.9', '3.10', '3.11', '3.12'): short_version = py_version.replace('.', '') try: zope_requirement = _generate( diff --git a/versions-prod.cfg b/versions-prod.cfg index bd3722c507..2ef1ff3a32 100644 --- a/versions-prod.cfg +++ b/versions-prod.cfg @@ -16,7 +16,7 @@ MultiMapping = 5.0 Paste = 3.5.3 PasteDeploy = 3.0.1 Persistence = 4.0.post1 -RestrictedPython = 6.2 +RestrictedPython = 7.0a1.dev1 WebTest = 3.0.0 WSGIProxy2 = 0.5.1 WebOb = 1.8.7 @@ -87,8 +87,21 @@ 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 +RestrictedPython = 6.2 -[versions:python312] -# Use the development version here until the final release to test Products -# against Python 3.12. -RestrictedPython = 7.0a1.dev1 +[versions:python38] +# Only use dev version on Python 3.12 +RestrictedPython = 6.2 + +[versions:python39] +# Only use dev version on Python 3.12 +RestrictedPython = 6.2 + +[versions:python310] +# Only use dev version on Python 3.12 +RestrictedPython = 6.2 + +[versions:python311] +# Only use dev version on Python 3.12 +RestrictedPython = 6.2