From d14ca906c2ccbd48d783bd87dd3a709c967a9e81 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 7 Jun 2024 09:35:42 +0200 Subject: [PATCH] Update to lastest version of master. --- README.md | 11 ++---- releases/master/constraints.txt | 43 +++++++++++---------- releases/master/requirements-full.txt | 43 +++++++++++---------- releases/master/versions-prod.cfg | 54 ++++++++++++++------------- releases/master/versions.cfg | 32 +--------------- 5 files changed, 77 insertions(+), 106 deletions(-) diff --git a/README.md b/README.md index 084121e3dc..d1f2d992fc 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,10 @@ (files created from the 4.x branch but not necessarily in sync with it) +* [versions.cfg](releases/4.x/versions.cfg) +* [versions-prod.cfg](releases/4.x/versions-prod.cfg) +* [requirements-full.txt](releases/4.x/requirements-full.txt) +* [constraints.txt](releases/4.x/constraints.txt) ## 5.10 @@ -210,13 +214,6 @@ * [requirements-full.txt](releases/4.8.11/requirements-full.txt) * [constraints.txt](releases/4.8.11/constraints.txt) -## 4.8.10 - -* [versions.cfg](releases/4.8.10/versions.cfg) -* [versions-prod.cfg](releases/4.8.10/versions-prod.cfg) -* [requirements-full.txt](releases/4.8.10/requirements-full.txt) -* [constraints.txt](releases/4.8.10/constraints.txt) - ## 4.8.9 * [versions.cfg](releases/4.8.9/versions.cfg) diff --git a/releases/master/constraints.txt b/releases/master/constraints.txt index 3b8d4ac5b0..f1417a392d 100644 --- a/releases/master/constraints.txt +++ b/releases/master/constraints.txt @@ -1,8 +1,7 @@ -AccessControl==6.3 -Acquisition==5.2 +AccessControl==7.0 +Acquisition==6.0 AuthEncoding==5.0 -BTrees==5.2 -Chameleon==4.2.0; python_version == '3.7' +BTrees==6.0 Chameleon==4.4.4; python_version == '3.8' Chameleon==4.4.4; python_version > '3.8' DateTime==5.5 @@ -10,10 +9,14 @@ DocumentTemplate==4.6 ExtensionClass==5.1 MultiMapping==5.0 Paste==3.10.1 -PasteDeploy==2.1.1; python_version == '3.7' -PasteDeploy==3.1.0; python_version > '3.7' -Persistence==4.1 -RestrictedPython==7.1 +PasteDeploy==3.1.0 +Persistence==5.0 +RestrictedPython==7.1; python_version == '3.10' +RestrictedPython==7.1; python_version == '3.11' +RestrictedPython==7.1; python_version == '3.12' +RestrictedPython==7.1; python_version == '3.8' +RestrictedPython==7.1; python_version == '3.9' +RestrictedPython==7.2a1.dev0; python_version > '3.12' WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 @@ -21,26 +24,22 @@ ZConfig==4.1 ZODB==6.0 Zope2==4.0 beautifulsoup4==4.12.3 -cffi==1.15.1; python_version == '3.7' -cffi==1.16.0; python_version > '3.7' +cffi==1.17.0rc1 multipart==0.2.4 -persistent==5.2 -pycparser==2.21; python_version == '3.7' -pycparser==2.22; python_version > '3.7' +persistent==6.0 +pycparser==2.22 python-gettext==5.0 pytz==2024.1 roman==4.2 six==1.16.0 -soupsieve==2.4.1; python_version == '3.7' -soupsieve==2.5; python_version > '3.7' +soupsieve==2.5 transaction==4.0 -waitress==2.1.2; python_version == '3.7' -waitress==3.0.0; python_version > '3.7' +waitress==3.0.0 z3c.pt==4.3 zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 -zodbpickle==3.3 +zodbpickle==4.0 zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 @@ -49,7 +48,7 @@ zope.browserresource==5.1 zope.cachedescriptors==5.0 zope.component==6.0 zope.configuration==5.0.1 -zope.container==5.2 +zope.container==6.0 zope.contentprovider==5.0 zope.contenttype==5.1 zope.datetime==5.0.0 @@ -63,7 +62,7 @@ zope.globalrequest==2.0 zope.hookable==6.0 zope.i18n==5.1 zope.i18nmessageid==6.1.0 -zope.interface==6.3 +zope.interface==6.4.post2 zope.lifecycleevent==5.0 zope.location==5.0 zope.pagetemplate==5.1 @@ -72,14 +71,14 @@ zope.proxy==5.2 zope.ptresource==5.0 zope.publisher==7.0 zope.schema==7.0.1 -zope.security==6.2 +zope.security==7.0 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.testbrowser==7.0 zope.testing==5.0.1 zope.traversing==5.0 zope.viewlet==5.0 diff --git a/releases/master/requirements-full.txt b/releases/master/requirements-full.txt index 210aa9aa31..2d254b4c4b 100644 --- a/releases/master/requirements-full.txt +++ b/releases/master/requirements-full.txt @@ -1,9 +1,8 @@ -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope -AccessControl==6.3 -Acquisition==5.2 +AccessControl==7.0 +Acquisition==6.0 AuthEncoding==5.0 -BTrees==5.2 -Chameleon==4.2.0; python_version == '3.7' +BTrees==6.0 Chameleon==4.4.4; python_version == '3.8' Chameleon==4.4.4; python_version > '3.8' DateTime==5.5 @@ -11,10 +10,14 @@ DocumentTemplate==4.6 ExtensionClass==5.1 MultiMapping==5.0 Paste==3.10.1 -PasteDeploy==2.1.1; python_version == '3.7' -PasteDeploy==3.1.0; python_version > '3.7' -Persistence==4.1 -RestrictedPython==7.1 +PasteDeploy==3.1.0 +Persistence==5.0 +RestrictedPython==7.1; python_version == '3.10' +RestrictedPython==7.1; python_version == '3.11' +RestrictedPython==7.1; python_version == '3.12' +RestrictedPython==7.1; python_version == '3.8' +RestrictedPython==7.1; python_version == '3.9' +RestrictedPython==7.2a1.dev0; python_version > '3.12' WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 @@ -22,26 +25,22 @@ ZConfig==4.1 ZODB==6.0 Zope2==4.0 beautifulsoup4==4.12.3 -cffi==1.15.1; python_version == '3.7' -cffi==1.16.0; python_version > '3.7' +cffi==1.17.0rc1 multipart==0.2.4 -persistent==5.2 -pycparser==2.21; python_version == '3.7' -pycparser==2.22; python_version > '3.7' +persistent==6.0 +pycparser==2.22 python-gettext==5.0 pytz==2024.1 roman==4.2 six==1.16.0 -soupsieve==2.4.1; python_version == '3.7' -soupsieve==2.5; python_version > '3.7' +soupsieve==2.5 transaction==4.0 -waitress==2.1.2; python_version == '3.7' -waitress==3.0.0; python_version > '3.7' +waitress==3.0.0 z3c.pt==4.3 zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 -zodbpickle==3.3 +zodbpickle==4.0 zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 @@ -50,7 +49,7 @@ zope.browserresource==5.1 zope.cachedescriptors==5.0 zope.component==6.0 zope.configuration==5.0.1 -zope.container==5.2 +zope.container==6.0 zope.contentprovider==5.0 zope.contenttype==5.1 zope.datetime==5.0.0 @@ -64,7 +63,7 @@ zope.globalrequest==2.0 zope.hookable==6.0 zope.i18n==5.1 zope.i18nmessageid==6.1.0 -zope.interface==6.3 +zope.interface==6.4.post2 zope.lifecycleevent==5.0 zope.location==5.0 zope.pagetemplate==5.1 @@ -73,14 +72,14 @@ zope.proxy==5.2 zope.ptresource==5.0 zope.publisher==7.0 zope.schema==7.0.1 -zope.security==6.2 +zope.security==7.0 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.testbrowser==7.0 zope.testing==5.0.1 zope.traversing==5.0 zope.viewlet==5.0 diff --git a/releases/master/versions-prod.cfg b/releases/master/versions-prod.cfg index a2e2b68b6c..c0470a0f92 100644 --- a/releases/master/versions-prod.cfg +++ b/releases/master/versions-prod.cfg @@ -4,10 +4,10 @@ [versions] Zope = Zope2 = 4.0 -AccessControl = 6.3 -Acquisition = 5.2 +AccessControl = 7.0 +Acquisition = 6.0 AuthEncoding = 5.0 -BTrees = 5.2 +BTrees = 6.0 Chameleon = 4.4.4 DateTime = 5.5 DocumentTemplate = 4.6 @@ -15,17 +15,17 @@ ExtensionClass = 5.1 MultiMapping = 5.0 Paste = 3.10.1 PasteDeploy = 3.1.0 -Persistence = 4.1 -RestrictedPython = 7.1 +Persistence = 5.0 +RestrictedPython = 7.2a1.dev0 WebTest = 3.0.0 WSGIProxy2 = 0.5.1 WebOb = 1.8.7 ZConfig = 4.1 ZODB = 6.0 beautifulsoup4 = 4.12.3 -cffi = 1.16.0 +cffi = 1.17.0rc1 multipart = 0.2.4 -persistent = 5.2 +persistent = 6.0 pycparser = 2.22 python-gettext = 5.0 pytz = 2024.1 @@ -38,7 +38,7 @@ z3c.pt = 4.3 zExceptions = 5.0 zc.lockfile = 3.0.post1 zc.recipe.egg = 2.0.7 -zodbpickle = 3.3 +zodbpickle = 4.0 zope.annotation = 5.0 zope.browser = 3.0 zope.browsermenu = 5.0 @@ -47,7 +47,7 @@ zope.browserresource = 5.1 zope.cachedescriptors = 5.0 zope.component = 6.0 zope.configuration = 5.0.1 -zope.container = 5.2 +zope.container = 6.0 zope.contentprovider = 5.0 zope.contenttype = 5.1 zope.datetime = 5.0.0 @@ -61,7 +61,7 @@ zope.globalrequest = 2.0 zope.hookable = 6.0 zope.i18n = 5.1 zope.i18nmessageid = 6.1.0 -zope.interface = 6.3 +zope.interface = 6.4.post2 zope.lifecycleevent = 5.0 zope.location = 5.0 zope.pagetemplate = 5.1 @@ -70,14 +70,14 @@ zope.proxy = 5.2 zope.ptresource = 5.0 zope.publisher = 7.0 zope.schema = 7.0.1 -zope.security = 6.2 +zope.security = 7.0 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.testbrowser = 7.0 zope.testing = 5.0.1 zope.traversing = 5.0 zope.viewlet = 5.0 @@ -85,17 +85,21 @@ zope.viewlet = 5.0 [versions:python38] # Chameleon >= 4.5 requires Python 3.9 Chameleon = 4.4.4 +# Use newest final release +RestrictedPython = 7.1 -[versions:python37] -# Chameleon >= 4.3 requires Python 3.8 -Chameleon = 4.2.0 -# PasteDeploy 3.x works on Python 3.7 but pulls tons of dependencies -PasteDeploy = 2.1.1 -# pycparser >= 2.22 requires Python 3.8 -pycparser = 2.21 -# 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 -# waitress >= 3.0 requires Python 3.8 -waitress = 2.1.2 +[versions:python39] +# Use newest final release +RestrictedPython = 7.1 + +[versions:python310] +# Use newest final release +RestrictedPython = 7.1 + +[versions:python311] +# Use newest final release +RestrictedPython = 7.1 + +[versions:python312] +# Use newest final release +RestrictedPython = 7.1 diff --git a/releases/master/versions.cfg b/releases/master/versions.cfg index cffbf62b5d..f987e61097 100644 --- a/releases/master/versions.cfg +++ b/releases/master/versions.cfg @@ -25,6 +25,8 @@ five.localsitemanager = 4.0 idna = 3.7 imagesize = 1.4.1 importlib-metadata = 7.1.0 +# Required by zope.testbrowser on Python 3.13 because WebOb still uses cgi. +legacy-cgi = 2.6 mr.developer = 2.0.2 packaging = 24.0 plone.recipe.command = 1.1 @@ -63,33 +65,3 @@ sphinxcontrib-htmlhelp = 2.0.1 sphinxcontrib-devhelp = 1.0.2 # sphinxcontrib-applehelp >= 1.0.5 requires Python 3.9+ sphinxcontrib-applehelp = 1.0.4 - -[versions:python37] -# alabaster >= 0.7.14 requires Python 3.9 -alabaster = 0.7.13 -# Babel >= 2.15 requires Python 3.8+ -Babel = 2.14.0 -# Sphinx 5.3.0 requires docutils <0.20 -docutils = 0.19 -# importlib-metadata 6.8.0 requires Python 3.8+ -importlib-metadata = 6.7.0 -# Pygments >= 2.18 requires Python 3.8+ -Pygments = 2.17.2 -# 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