From dac5e0250c21610403744126230c675715019408 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl <jens@plyp.com> Date: Sat, 18 May 2024 10:07:14 +0200 Subject: [PATCH] - vb and update to latest version of dependencies --- CHANGES.rst | 6 +++++ constraints.txt | 42 ++++++++++++++++++--------------- requirements-full.txt | 44 ++++++++++++++++++---------------- setup.py | 2 +- versions-prod.cfg | 50 +++++++++++++++++++++++---------------- versions.cfg | 55 ++++++++++++++++++++++++++----------------- 6 files changed, 118 insertions(+), 81 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b52821c454..629cd6e780 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,12 @@ since the branch point at Zope 4.1.2. The change log for the previous version, Zope 4, is at https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst +5.10.1 (unreleased) +------------------- + +- Update to newest compatible versions of dependencies. + + 5.10 (2024-05-18) ----------------- diff --git a/constraints.txt b/constraints.txt index 7fff92cc16..ec4a10b70d 100644 --- a/constraints.txt +++ b/constraints.txt @@ -1,13 +1,15 @@ AccessControl==6.3 -Acquisition==5.1 +Acquisition==5.2 AuthEncoding==5.0 -BTrees==5.1 -Chameleon==4.2.0 -DateTime==5.3 +BTrees==5.2 +Chameleon==4.2.0; python_version == '3.7' +Chameleon==4.4.4; python_version == '3.8' +Chameleon==4.4.4; python_version > '3.8' +DateTime==5.5 DocumentTemplate==4.6 ExtensionClass==5.1 MultiMapping==5.0 -Paste==3.7.1 +Paste==3.10.1 PasteDeploy==2.1.1; python_version == '3.7' PasteDeploy==3.1.0; python_version > '3.7' Persistence==4.1 @@ -15,28 +17,30 @@ RestrictedPython==7.1 WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 -ZConfig==4.0 -ZODB==5.8.1 +ZConfig==4.1 +ZODB==6.0 Zope2==4.0 -beautifulsoup4==4.12.2 +beautifulsoup4==4.12.3 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 +persistent==5.2 +pycparser==2.21; python_version == '3.7' +pycparser==2.22; python_version > '3.7' python-gettext==5.0 -pytz==2023.3.post1 -roman==4.1 +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' transaction==4.0 -waitress==2.1.2 -z3c.pt==4.0 +waitress==2.1.2; python_version == '3.7' +waitress==3.0.0; python_version > '3.7' +z3c.pt==4.3 zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 -zodbpickle==3.1 +zodbpickle==3.3 zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 @@ -44,7 +48,7 @@ zope.browserpage==5.0 zope.browserresource==5.1 zope.cachedescriptors==5.0 zope.component==6.0 -zope.configuration==5.0 +zope.configuration==5.0.1 zope.container==5.2 zope.contentprovider==5.0 zope.contenttype==5.1 @@ -59,12 +63,12 @@ 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 zope.lifecycleevent==5.0 zope.location==5.0 -zope.pagetemplate==5.0 +zope.pagetemplate==5.1 zope.processlifetime==3.0 -zope.proxy==5.1 +zope.proxy==5.2 zope.ptresource==5.0 zope.publisher==7.0 zope.schema==7.0.1 diff --git a/requirements-full.txt b/requirements-full.txt index 1ed2fd3b6d..dac553088a 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -1,14 +1,16 @@ -Zope==5.10 +-e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope AccessControl==6.3 -Acquisition==5.1 +Acquisition==5.2 AuthEncoding==5.0 -BTrees==5.1 -Chameleon==4.2.0 -DateTime==5.3 +BTrees==5.2 +Chameleon==4.2.0; python_version == '3.7' +Chameleon==4.4.4; python_version == '3.8' +Chameleon==4.4.4; python_version > '3.8' +DateTime==5.5 DocumentTemplate==4.6 ExtensionClass==5.1 MultiMapping==5.0 -Paste==3.7.1 +Paste==3.10.1 PasteDeploy==2.1.1; python_version == '3.7' PasteDeploy==3.1.0; python_version > '3.7' Persistence==4.1 @@ -16,28 +18,30 @@ RestrictedPython==7.1 WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 -ZConfig==4.0 -ZODB==5.8.1 +ZConfig==4.1 +ZODB==6.0 Zope2==4.0 -beautifulsoup4==4.12.2 +beautifulsoup4==4.12.3 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 +persistent==5.2 +pycparser==2.21; python_version == '3.7' +pycparser==2.22; python_version > '3.7' python-gettext==5.0 -pytz==2023.3.post1 -roman==4.1 +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' transaction==4.0 -waitress==2.1.2 -z3c.pt==4.0 +waitress==2.1.2; python_version == '3.7' +waitress==3.0.0; python_version > '3.7' +z3c.pt==4.3 zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 -zodbpickle==3.1 +zodbpickle==3.3 zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 @@ -45,7 +49,7 @@ zope.browserpage==5.0 zope.browserresource==5.1 zope.cachedescriptors==5.0 zope.component==6.0 -zope.configuration==5.0 +zope.configuration==5.0.1 zope.container==5.2 zope.contentprovider==5.0 zope.contenttype==5.1 @@ -60,12 +64,12 @@ 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 zope.lifecycleevent==5.0 zope.location==5.0 -zope.pagetemplate==5.0 +zope.pagetemplate==5.1 zope.processlifetime==3.0 -zope.proxy==5.1 +zope.proxy==5.2 zope.ptresource==5.0 zope.publisher==7.0 zope.schema==7.0.1 diff --git a/setup.py b/setup.py index 0d3d461710..3c2f4a24d7 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def _read_file(filename): README = _read_file('README.rst') CHANGES = _read_file('CHANGES.rst') -version = '5.10' +version = '5.10.1.dev0' setup( name='Zope', diff --git a/versions-prod.cfg b/versions-prod.cfg index 9a0f34d178..ab07d3d23a 100644 --- a/versions-prod.cfg +++ b/versions-prod.cfg @@ -2,43 +2,43 @@ # Version pins for required and commonly used dependencies. [versions] -Zope = 5.10 +Zope = Zope2 = 4.0 AccessControl = 6.3 -Acquisition = 5.1 +Acquisition = 5.2 AuthEncoding = 5.0 -BTrees = 5.1 -Chameleon = 4.2.0 -DateTime = 5.3 +BTrees = 5.2 +Chameleon = 4.4.4 +DateTime = 5.5 DocumentTemplate = 4.6 ExtensionClass = 5.1 MultiMapping = 5.0 -Paste = 3.7.1 +Paste = 3.10.1 PasteDeploy = 3.1.0 Persistence = 4.1 RestrictedPython = 7.1 WebTest = 3.0.0 WSGIProxy2 = 0.5.1 WebOb = 1.8.7 -ZConfig = 4.0 -ZODB = 5.8.1 -beautifulsoup4 = 4.12.2 +ZConfig = 4.1 +ZODB = 6.0 +beautifulsoup4 = 4.12.3 cffi = 1.16.0 multipart = 0.2.4 -persistent = 5.1 -pycparser = 2.21 +persistent = 5.2 +pycparser = 2.22 python-gettext = 5.0 -pytz = 2023.3.post1 +pytz = 2024.1 six = 1.16.0 -roman = 4.1 +roman = 4.2 soupsieve = 2.5 transaction = 4.0 -waitress = 2.1.2 -z3c.pt = 4.0 +waitress = 3.0.0 +z3c.pt = 4.3 zExceptions = 5.0 zc.lockfile = 3.0.post1 zc.recipe.egg = 2.0.7 -zodbpickle = 3.1 +zodbpickle = 3.3 zope.annotation = 5.0 zope.browser = 3.0 zope.browsermenu = 5.0 @@ -46,7 +46,7 @@ zope.browserpage = 5.0 zope.browserresource = 5.1 zope.cachedescriptors = 5.0 zope.component = 6.0 -zope.configuration = 5.0 +zope.configuration = 5.0.1 zope.container = 5.2 zope.contentprovider = 5.0 zope.contenttype = 5.1 @@ -61,12 +61,12 @@ 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 zope.lifecycleevent = 5.0 zope.location = 5.0 -zope.pagetemplate = 5.0 +zope.pagetemplate = 5.1 zope.processlifetime = 3.0 -zope.proxy = 5.1 +zope.proxy = 5.2 zope.ptresource = 5.0 zope.publisher = 7.0 zope.schema = 7.0.1 @@ -82,10 +82,20 @@ zope.testing = 5.0.1 zope.traversing = 5.0 zope.viewlet = 5.0 +[versions:python38] +# Chameleon >= 4.5 requires Python 3.9 +Chameleon = 4.4.4 + [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 diff --git a/versions.cfg b/versions.cfg index a9a25a6878..cffbf62b5d 100644 --- a/versions.cfg +++ b/versions.cfg @@ -5,47 +5,52 @@ versions = versions [versions] # Version pins for development and optional dependencies. -Babel = 2.13.1 -Jinja2 = 3.1.2 +Babel = 2.15.0 +Jinja2 = 3.1.4 Missing = 5.0 -MarkupSafe = 2.1.3 +MarkupSafe = 2.1.5 Products.BTreeFolder2 = 5.1 -Products.ZCatalog = 7.0 -Pygments = 2.17.2 -Record = 4.0 -Sphinx = 7.2.6 -alabaster = 0.7.13 +Products.ZCatalog = 7.1 +Pygments = 2.18.0 +Record = 4.1 +Sphinx = 7.3.7 +alabaster = 0.7.16 certifi = 2024.2.2 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 +# sphinx-rtd-theme 2.0.0 requires docutils <21 +docutils = 0.20.1 five.localsitemanager = 4.0 -idna = 3.4 +idna = 3.7 imagesize = 1.4.1 -importlib-metadata = 6.8.0 +importlib-metadata = 7.1.0 mr.developer = 2.0.2 -packaging = 23.2 +packaging = 24.0 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 +sphinx-rtd-theme = 2.0.0 +sphinxcontrib-applehelp = 1.0.8 +sphinxcontrib-devhelp = 1.0.6 +sphinxcontrib-htmlhelp = 2.0.5 sphinxcontrib-jquery = 4.1 sphinxcontrib-jsmath = 1.0.1 -sphinxcontrib-qthelp = 1.0.6 -sphinxcontrib-serializinghtml = 1.1.9 +sphinxcontrib-qthelp = 1.0.7 +sphinxcontrib-serializinghtml = 1.1.10 tempstorage = 6.0 -urllib3 = 2.1.0 +tomli = 2.0.1 +urllib3 = 2.2.1 z3c.checkversions = 2.1 zc.recipe.testrunner = 3.0 -zipp = 3.17.0 +zipp = 3.18.2 zope.testrunner = 6.4 [versions:python38] +# alabaster >= 0.7.14 requires Python 3.9 +alabaster = 0.7.13 +# Required dependency on Python 3.8 only +importlib-resources = 6.4.0 # Sphinx >= 7.2 requires Python 3.9+ Sphinx = 7.1.2 # sphinxcontrib-serializinghtml >= 1.1.6 requires Python 3.9+ @@ -60,8 +65,16 @@ sphinxcontrib-devhelp = 1.0.2 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