From fce66c7eafc630e93f8cd8e427c637ee848d0d9a Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Fri, 24 Nov 2023 10:59:10 +0100 Subject: [PATCH] - add release 5.9 and update pins for master --- README.md | 7 +++ releases/4.x/requirements-full.txt | 2 +- releases/4.x/versions-prod.cfg | 2 +- releases/5.9/constraints.txt | 81 ++++++++++++++++++++++++ releases/5.9/requirements-full.txt | 82 ++++++++++++++++++++++++ releases/5.9/versions-prod.cfg | 91 +++++++++++++++++++++++++++ releases/5.9/versions.cfg | 82 ++++++++++++++++++++++++ releases/master/constraints.txt | 19 +++--- releases/master/requirements-full.txt | 19 +++--- releases/master/versions-prod.cfg | 32 +++------- releases/master/versions.cfg | 14 +++-- 11 files changed, 374 insertions(+), 57 deletions(-) create mode 100644 releases/5.9/constraints.txt create mode 100644 releases/5.9/requirements-full.txt create mode 100644 releases/5.9/versions-prod.cfg create mode 100644 releases/5.9/versions.cfg diff --git a/README.md b/README.md index 8b16c5da3b..e7e1ffc2e7 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,13 @@ * [requirements-full.txt](releases/4.x/requirements-full.txt) * [constraints.txt](releases/4.x/constraints.txt) +## 5.9 + +* [versions.cfg](releases/5.9/versions.cfg) +* [versions-prod.cfg](releases/5.9/versions-prod.cfg) +* [requirements-full.txt](releases/5.9/requirements-full.txt) +* [constraints.txt](releases/5.9/constraints.txt) + ## 5.8.6 * [versions.cfg](releases/5.8.6/versions.cfg) diff --git a/releases/4.x/requirements-full.txt b/releases/4.x/requirements-full.txt index 5c8bf15bc2..08ead5fe87 100644 --- a/releases/4.x/requirements-full.txt +++ b/releases/4.x/requirements-full.txt @@ -1,4 +1,4 @@ -Zope==< 5 +Zope==<5 AccessControl==4.4 Acquisition==4.13 AuthEncoding==4.3 diff --git a/releases/4.x/versions-prod.cfg b/releases/4.x/versions-prod.cfg index 548751cb65..57b3153f3d 100644 --- a/releases/4.x/versions-prod.cfg +++ b/releases/4.x/versions-prod.cfg @@ -2,7 +2,7 @@ # Version pins for required and commonly used dependencies. [versions] -Zope = < 5 +Zope = <5 Zope2 = 4.0 # AccessControl 5+ no longer supports Zope 4. AccessControl = 4.4 diff --git a/releases/5.9/constraints.txt b/releases/5.9/constraints.txt new file mode 100644 index 0000000000..29970c6ed5 --- /dev/null +++ b/releases/5.9/constraints.txt @@ -0,0 +1,81 @@ +AccessControl==6.3 +Acquisition==5.1 +AuthEncoding==5.0 +BTrees==5.1 +Chameleon==4.2.0 +DateTime==5.3 +DocumentTemplate==4.6 +ExtensionClass==5.1 +MultiMapping==5.0 +Paste==3.7.1 +PasteDeploy==2.1.1; python_version == '3.7' +PasteDeploy==3.1.0; python_version > '3.7' +Persistence==4.1 +RestrictedPython==7.0 +WSGIProxy2==0.5.1 +WebOb==1.8.7 +WebTest==3.0.0 +ZConfig==4.0 +ZODB==5.8.1 +Zope2==4.0 +beautifulsoup4==4.12.2 +cffi==1.15.1; python_version == '3.7' +cffi==1.16.0; python_version > '3.7' +multipart==0.2.4 +persistent==5.1 +pycparser==2.21 +python-gettext==5.0 +pytz==2023.3.post1 +roman==4.1 +six==1.16.0 +soupsieve==2.4.1; python_version == '3.7' +soupsieve==2.5; python_version > '3.7' +transaction==4.0 +waitress==2.1.2 +z3c.pt==4.0 +zExceptions==5.0 +zc.lockfile==3.0.post1 +zc.recipe.egg==2.0.7 +zodbpickle==3.1 +zope.annotation==5.0 +zope.browser==3.0 +zope.browsermenu==5.0 +zope.browserpage==5.0 +zope.browserresource==5.1 +zope.cachedescriptors==5.0 +zope.component==6.0 +zope.configuration==5.0 +zope.container==5.2 +zope.contentprovider==5.0 +zope.contenttype==5.1 +zope.datetime==5.0.0 +zope.deferredimport==5.0 +zope.deprecation==5.0 +zope.dottedname==6.0 +zope.event==5.0 +zope.exceptions==5.0.1 +zope.filerepresentation==6.0 +zope.globalrequest==2.0 +zope.hookable==6.0 +zope.i18n==5.1 +zope.i18nmessageid==6.1.0 +zope.interface==6.1 +zope.lifecycleevent==5.0 +zope.location==5.0 +zope.pagetemplate==5.0 +zope.processlifetime==3.0 +zope.proxy==5.1 +zope.ptresource==5.0 +zope.publisher==7.0 +zope.schema==7.0.1 +zope.security==6.2 +zope.sequencesort==5.0 +zope.site==5.0 +zope.size==5.0 +zope.structuredtext==5.0 +zope.tal==5.0.1 +zope.tales==6.0 +zope.testbrowser==6.0 +zope.testing==5.0.1 +zope.traversing==5.0 +zope.viewlet==5.0 diff --git a/releases/5.9/requirements-full.txt b/releases/5.9/requirements-full.txt new file mode 100644 index 0000000000..7180538935 --- /dev/null +++ b/releases/5.9/requirements-full.txt @@ -0,0 +1,82 @@ +Zope==5.9 +AccessControl==6.3 +Acquisition==5.1 +AuthEncoding==5.0 +BTrees==5.1 +Chameleon==4.2.0 +DateTime==5.3 +DocumentTemplate==4.6 +ExtensionClass==5.1 +MultiMapping==5.0 +Paste==3.7.1 +PasteDeploy==2.1.1; python_version == '3.7' +PasteDeploy==3.1.0; python_version > '3.7' +Persistence==4.1 +RestrictedPython==7.0 +WSGIProxy2==0.5.1 +WebOb==1.8.7 +WebTest==3.0.0 +ZConfig==4.0 +ZODB==5.8.1 +Zope2==4.0 +beautifulsoup4==4.12.2 +cffi==1.15.1; python_version == '3.7' +cffi==1.16.0; python_version > '3.7' +multipart==0.2.4 +persistent==5.1 +pycparser==2.21 +python-gettext==5.0 +pytz==2023.3.post1 +roman==4.1 +six==1.16.0 +soupsieve==2.4.1; python_version == '3.7' +soupsieve==2.5; python_version > '3.7' +transaction==4.0 +waitress==2.1.2 +z3c.pt==4.0 +zExceptions==5.0 +zc.lockfile==3.0.post1 +zc.recipe.egg==2.0.7 +zodbpickle==3.1 +zope.annotation==5.0 +zope.browser==3.0 +zope.browsermenu==5.0 +zope.browserpage==5.0 +zope.browserresource==5.1 +zope.cachedescriptors==5.0 +zope.component==6.0 +zope.configuration==5.0 +zope.container==5.2 +zope.contentprovider==5.0 +zope.contenttype==5.1 +zope.datetime==5.0.0 +zope.deferredimport==5.0 +zope.deprecation==5.0 +zope.dottedname==6.0 +zope.event==5.0 +zope.exceptions==5.0.1 +zope.filerepresentation==6.0 +zope.globalrequest==2.0 +zope.hookable==6.0 +zope.i18n==5.1 +zope.i18nmessageid==6.1.0 +zope.interface==6.1 +zope.lifecycleevent==5.0 +zope.location==5.0 +zope.pagetemplate==5.0 +zope.processlifetime==3.0 +zope.proxy==5.1 +zope.ptresource==5.0 +zope.publisher==7.0 +zope.schema==7.0.1 +zope.security==6.2 +zope.sequencesort==5.0 +zope.site==5.0 +zope.size==5.0 +zope.structuredtext==5.0 +zope.tal==5.0.1 +zope.tales==6.0 +zope.testbrowser==6.0 +zope.testing==5.0.1 +zope.traversing==5.0 +zope.viewlet==5.0 diff --git a/releases/5.9/versions-prod.cfg b/releases/5.9/versions-prod.cfg new file mode 100644 index 0000000000..ee8e7c4059 --- /dev/null +++ b/releases/5.9/versions-prod.cfg @@ -0,0 +1,91 @@ +[buildout] +# Version pins for required and commonly used dependencies. + +[versions] +Zope = 5.9 +Zope2 = 4.0 +AccessControl = 6.3 +Acquisition = 5.1 +AuthEncoding = 5.0 +BTrees = 5.1 +Chameleon = 4.2.0 +DateTime = 5.3 +DocumentTemplate = 4.6 +ExtensionClass = 5.1 +MultiMapping = 5.0 +Paste = 3.7.1 +PasteDeploy = 3.1.0 +Persistence = 4.1 +RestrictedPython = 7.0 +WebTest = 3.0.0 +WSGIProxy2 = 0.5.1 +WebOb = 1.8.7 +ZConfig = 4.0 +ZODB = 5.8.1 +beautifulsoup4 = 4.12.2 +cffi = 1.16.0 +multipart = 0.2.4 +persistent = 5.1 +pycparser = 2.21 +python-gettext = 5.0 +pytz = 2023.3.post1 +six = 1.16.0 +roman = 4.1 +soupsieve = 2.5 +transaction = 4.0 +waitress = 2.1.2 +z3c.pt = 4.0 +zExceptions = 5.0 +zc.lockfile = 3.0.post1 +zc.recipe.egg = 2.0.7 +zodbpickle = 3.1 +zope.annotation = 5.0 +zope.browser = 3.0 +zope.browsermenu = 5.0 +zope.browserpage = 5.0 +zope.browserresource = 5.1 +zope.cachedescriptors = 5.0 +zope.component = 6.0 +zope.configuration = 5.0 +zope.container = 5.2 +zope.contentprovider = 5.0 +zope.contenttype = 5.1 +zope.datetime = 5.0.0 +zope.deferredimport = 5.0 +zope.deprecation = 5.0 +zope.dottedname = 6.0 +zope.event = 5.0 +zope.exceptions = 5.0.1 +zope.filerepresentation = 6.0 +zope.globalrequest = 2.0 +zope.hookable = 6.0 +zope.i18n = 5.1 +zope.i18nmessageid = 6.1.0 +zope.interface = 6.1 +zope.lifecycleevent = 5.0 +zope.location = 5.0 +zope.pagetemplate = 5.0 +zope.processlifetime = 3.0 +zope.proxy = 5.1 +zope.ptresource = 5.0 +zope.publisher = 7.0 +zope.schema = 7.0.1 +zope.security = 6.2 +zope.sequencesort = 5.0 +zope.site = 5.0 +zope.size = 5.0 +zope.structuredtext = 5.0 +zope.tal = 5.0.1 +zope.tales = 6.0 +zope.testbrowser = 6.0 +zope.testing = 5.0.1 +zope.traversing = 5.0 +zope.viewlet = 5.0 + +[versions:python37] +# PasteDeploy 3.x works on Python 3.7 but pulls tons of dependencies +PasteDeploy = 2.1.1 +# SoupSieve 2.5 and up requires Python 3.8 +soupsieve = 2.4.1 +# cffi 1.16.0 requires Python 3.8 +cffi = 1.15.1 diff --git a/releases/5.9/versions.cfg b/releases/5.9/versions.cfg new file mode 100644 index 0000000000..efe6070889 --- /dev/null +++ b/releases/5.9/versions.cfg @@ -0,0 +1,82 @@ +[buildout] +extends = + versions-prod.cfg +versions = versions + +[versions] +# Version pins for development and optional dependencies. +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.17.2 +Record = 4.0 +Sphinx = 7.2.6 +alabaster = 0.7.13 +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 +docutils = 0.18.1 +five.localsitemanager = 4.0 +idna = 3.4 +imagesize = 1.4.1 +importlib-metadata = 6.8.0 +mr.developer = 2.0.1 +packaging = 23.2 +plone.recipe.command = 1.1 +requests = 2.31.0 +snowballstemmer = 2.2.0 +sphinx-rtd-theme = 1.3.0 +sphinxcontrib-applehelp = 1.0.7 +sphinxcontrib-devhelp = 1.0.5 +sphinxcontrib-htmlhelp = 2.0.4 +sphinxcontrib-jquery = 4.1 +sphinxcontrib-jsmath = 1.0.1 +sphinxcontrib-qthelp = 1.0.6 +sphinxcontrib-serializinghtml = 1.1.9 +tempstorage = 6.0 +urllib3 = 2.1.0 +z3c.checkversions = 2.1 +zc.recipe.testrunner = 3.0 +zipp = 3.17.0 +zope.testrunner = 6.2 + +[versions:python38] +# Sphinx >= 7.2 requires Python 3.9+ +Sphinx = 7.1.2 +# sphinxcontrib-serializinghtml >= 1.1.6 requires Python 3.9+ +sphinxcontrib-serializinghtml = 1.1.5 +# sphinxcontrib-qthelp >= 1.0.4 requires Python 3.9+ +sphinxcontrib-qthelp = 1.0.3 +# sphinxcontrib-htmlhelp >= 2.0.2 requires Python 3.9+ +sphinxcontrib-htmlhelp = 2.0.1 +# sphinxcontrib-devhelp >= 1.0.3 requires Python 3.9+ +sphinxcontrib-devhelp = 1.0.2 +# sphinxcontrib-applehelp >= 1.0.5 requires Python 3.9+ +sphinxcontrib-applehelp = 1.0.4 + +[versions:python37] +# importlib-metadata 6.8.0 requires Python 3.8+ +importlib-metadata = 6.7.0 +# Sphinx >= 6.0 requires Python 3.8+ +Sphinx = 5.3.0 +# Sphinx 5.3 requires typing-extensions for Python 3.7 +typing-extensions = 4.7.1 +# sphinxcontrib-serializinghtml >= 1.1.6 requires Python 3.9+ +sphinxcontrib-serializinghtml = 1.1.5 +# sphinxcontrib-qthelp >= 1.0.4 requires Python 3.9+ +sphinxcontrib-qthelp = 1.0.3 +# sphinxcontrib-htmlhelp >= 2.0.1 requires Python 3.8+ +sphinxcontrib-htmlhelp = 2.0.0 +# sphinxcontrib-devhelp >= 1.0.3 requires Python 3.9+ +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 diff --git a/releases/master/constraints.txt b/releases/master/constraints.txt index 4a88b3fb41..29970c6ed5 100644 --- a/releases/master/constraints.txt +++ b/releases/master/constraints.txt @@ -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 @@ -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 diff --git a/releases/master/requirements-full.txt b/releases/master/requirements-full.txt index ab8e7ee40f..c88cf0c9f7 100644 --- a/releases/master/requirements-full.txt +++ b/releases/master/requirements-full.txt @@ -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 @@ -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 diff --git a/releases/master/versions-prod.cfg b/releases/master/versions-prod.cfg index f818ec7112..b5bc1d1823 100644 --- a/releases/master/versions-prod.cfg +++ b/releases/master/versions-prod.cfg @@ -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 @@ -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 @@ -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 diff --git a/releases/master/versions.cfg b/releases/master/versions.cfg index f80ab773e9..efe6070889 100644 --- a/releases/master/versions.cfg +++ b/releases/master/versions.cfg @@ -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 @@ -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+ @@ -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