diff --git a/CHANGES.rst b/CHANGES.rst index eb15658756..b486b8cb33 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,13 @@ 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.8.5 (unreleased) +------------------ + +- Update to newest compatible versions of dependencies. + + 5.8.4 (2023-09-06) ------------------ diff --git a/constraints.txt b/constraints.txt index 20906077b6..c13d5b7232 100644 --- a/constraints.txt +++ b/constraints.txt @@ -2,8 +2,8 @@ AccessControl==6.2 Acquisition==5.0 AuthEncoding==5.0 BTrees==5.0 -Chameleon==4.0.0 -DateTime==5.1 +Chameleon==4.1.0 +DateTime==5.2 DocumentTemplate==4.4 ExtensionClass==5.0 MultiMapping==5.0 @@ -16,7 +16,7 @@ WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 ZConfig==4.0 -ZODB==5.8.0 +ZODB==5.8.1 Zope2==4.0 beautifulsoup4==4.12.2 cffi==1.15.1 @@ -24,14 +24,15 @@ multipart==0.2.4 persistent==5.0 pycparser==2.21 python-gettext==5.0 -pytz==2023.3 +pytz==2023.3.post1 roman==4.1 six==1.16.0 -soupsieve==2.4.1 +soupsieve==2.4.1; python_version == '3.7' +soupsieve==2.5; python_version > '3.7' transaction==3.1.0 waitress==2.1.2 z3c.pt==4.0 -zExceptions==4.3 +zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 zodbpickle==3.0.1 @@ -39,7 +40,7 @@ zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 zope.browserpage==5.0 -zope.browserresource==5.0 +zope.browserresource==5.1 zope.cachedescriptors==5.0 zope.component==6.0 zope.configuration==5.0 @@ -47,32 +48,32 @@ zope.container==5.1 zope.contentprovider==5.0 zope.contenttype==5.0 zope.datetime==5.0.0 -zope.deferredimport==4.4 +zope.deferredimport==5.0 zope.deprecation==5.0 zope.dottedname==6.0 -zope.event==4.6 -zope.exceptions==4.6 +zope.event==5.0 +zope.exceptions==5.0.1 zope.filerepresentation==6.0 zope.globalrequest==2.0 zope.hookable==5.4 -zope.i18n==5.0 +zope.i18n==5.1 zope.i18nmessageid==6.0.1 zope.interface==6.0 -zope.lifecycleevent==4.4 +zope.lifecycleevent==5.0 zope.location==5.0 zope.pagetemplate==5.0 zope.processlifetime==3.0 zope.proxy==5.0.0 zope.ptresource==5.0 -zope.publisher==6.1.0 +zope.publisher==7.0 zope.schema==7.0.1 zope.security==6.1 zope.sequencesort==5.0 -zope.site==4.6.1 -zope.size==4.4 +zope.site==5.0 +zope.size==5.0 zope.structuredtext==5.0 zope.tal==5.0.1 -zope.tales==5.2 +zope.tales==6.0 zope.testbrowser==6.0 zope.testing==5.0.1 zope.traversing==5.0 diff --git a/requirements-full.txt b/requirements-full.txt index 4545408d01..b07ab70ae4 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -1,10 +1,10 @@ -Zope==5.8.4 +-e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope AccessControl==6.2 Acquisition==5.0 AuthEncoding==5.0 BTrees==5.0 -Chameleon==4.0.0 -DateTime==5.1 +Chameleon==4.1.0 +DateTime==5.2 DocumentTemplate==4.4 ExtensionClass==5.0 MultiMapping==5.0 @@ -17,7 +17,7 @@ WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 ZConfig==4.0 -ZODB==5.8.0 +ZODB==5.8.1 Zope2==4.0 beautifulsoup4==4.12.2 cffi==1.15.1 @@ -25,14 +25,15 @@ multipart==0.2.4 persistent==5.0 pycparser==2.21 python-gettext==5.0 -pytz==2023.3 +pytz==2023.3.post1 roman==4.1 six==1.16.0 -soupsieve==2.4.1 +soupsieve==2.4.1; python_version == '3.7' +soupsieve==2.5; python_version > '3.7' transaction==3.1.0 waitress==2.1.2 z3c.pt==4.0 -zExceptions==4.3 +zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 zodbpickle==3.0.1 @@ -40,7 +41,7 @@ zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 zope.browserpage==5.0 -zope.browserresource==5.0 +zope.browserresource==5.1 zope.cachedescriptors==5.0 zope.component==6.0 zope.configuration==5.0 @@ -48,32 +49,32 @@ zope.container==5.1 zope.contentprovider==5.0 zope.contenttype==5.0 zope.datetime==5.0.0 -zope.deferredimport==4.4 +zope.deferredimport==5.0 zope.deprecation==5.0 zope.dottedname==6.0 -zope.event==4.6 -zope.exceptions==4.6 +zope.event==5.0 +zope.exceptions==5.0.1 zope.filerepresentation==6.0 zope.globalrequest==2.0 zope.hookable==5.4 -zope.i18n==5.0 +zope.i18n==5.1 zope.i18nmessageid==6.0.1 zope.interface==6.0 -zope.lifecycleevent==4.4 +zope.lifecycleevent==5.0 zope.location==5.0 zope.pagetemplate==5.0 zope.processlifetime==3.0 zope.proxy==5.0.0 zope.ptresource==5.0 -zope.publisher==6.1.0 +zope.publisher==7.0 zope.schema==7.0.1 zope.security==6.1 zope.sequencesort==5.0 -zope.site==4.6.1 -zope.size==4.4 +zope.site==5.0 +zope.size==5.0 zope.structuredtext==5.0 zope.tal==5.0.1 -zope.tales==5.2 +zope.tales==6.0 zope.testbrowser==6.0 zope.testing==5.0.1 zope.traversing==5.0 diff --git a/setup.py b/setup.py index acbf15a607..d80b72e718 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.8.4' +version = '5.8.5.dev0' setup( name='Zope', diff --git a/versions-prod.cfg b/versions-prod.cfg index f7655170af..ab183a9f6b 100644 --- a/versions-prod.cfg +++ b/versions-prod.cfg @@ -2,14 +2,14 @@ # Version pins for required and commonly used dependencies. [versions] -Zope = 5.8.4 +Zope = Zope2 = 4.0 AccessControl = 6.2 Acquisition = 5.0 AuthEncoding = 5.0 BTrees = 5.0 -Chameleon = 4.0.0 -DateTime = 5.1 +Chameleon = 4.1.0 +DateTime = 5.2 DocumentTemplate = 4.4 ExtensionClass = 5.0 MultiMapping = 5.0 @@ -21,21 +21,21 @@ WebTest = 3.0.0 WSGIProxy2 = 0.5.1 WebOb = 1.8.7 ZConfig = 4.0 -ZODB = 5.8.0 +ZODB = 5.8.1 beautifulsoup4 = 4.12.2 cffi = 1.15.1 multipart = 0.2.4 persistent = 5.0 pycparser = 2.21 python-gettext = 5.0 -pytz = 2023.3 +pytz = 2023.3.post1 six = 1.16.0 roman = 4.1 -soupsieve = 2.4.1 +soupsieve = 2.5 transaction = 3.1.0 waitress = 2.1.2 z3c.pt = 4.0 -zExceptions = 4.3 +zExceptions = 5.0 zc.lockfile = 3.0.post1 zc.recipe.egg = 2.0.7 zodbpickle = 3.0.1 @@ -43,7 +43,7 @@ zope.annotation = 5.0 zope.browser = 3.0 zope.browsermenu = 5.0 zope.browserpage = 5.0 -zope.browserresource = 5.0 +zope.browserresource = 5.1 zope.cachedescriptors = 5.0 zope.component = 6.0 zope.configuration = 5.0 @@ -51,32 +51,32 @@ zope.container = 5.1 zope.contentprovider = 5.0 zope.contenttype = 5.0 zope.datetime = 5.0.0 -zope.deferredimport = 4.4 +zope.deferredimport = 5.0 zope.deprecation = 5.0 zope.dottedname = 6.0 -zope.event = 4.6 -zope.exceptions = 4.6 +zope.event = 5.0 +zope.exceptions = 5.0.1 zope.filerepresentation = 6.0 zope.globalrequest = 2.0 zope.hookable = 5.4 -zope.i18n = 5.0 +zope.i18n = 5.1 zope.i18nmessageid = 6.0.1 zope.interface = 6.0 -zope.lifecycleevent = 4.4 +zope.lifecycleevent = 5.0 zope.location = 5.0 zope.pagetemplate = 5.0 zope.processlifetime = 3.0 zope.proxy = 5.0.0 zope.ptresource = 5.0 -zope.publisher = 6.1.0 +zope.publisher = 7.0 zope.schema = 7.0.1 zope.security = 6.1 zope.sequencesort = 5.0 -zope.site = 4.6.1 -zope.size = 4.4 +zope.site = 5.0 +zope.size = 5.0 zope.structuredtext = 5.0 zope.tal = 5.0.1 -zope.tales = 5.2 +zope.tales = 6.0 zope.testbrowser = 6.0 zope.testing = 5.0.1 zope.traversing = 5.0 @@ -85,6 +85,8 @@ 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 [versions:python312] # Use the development version here until the final release to test Products diff --git a/versions.cfg b/versions.cfg index c1db38aba0..762c88ba42 100644 --- a/versions.cfg +++ b/versions.cfg @@ -7,39 +7,39 @@ versions = versions # Version pins for development and optional dependencies. Babel = 2.12.1 Jinja2 = 3.1.2 -Missing = 4.2 +Missing = 5.0 MarkupSafe = 2.1.3 Products.BTreeFolder2 = 5.1 Products.ZCatalog = 7.0 -Pygments = 2.15.1 +Pygments = 2.16.1 Record = 4.0 -# sphinx-rtd-theme 1.2.2 requires Sphinx<7 -Sphinx = 6.2.1 +Sphinx = 7.2.5 alabaster = 0.7.13 -certifi = 2023.5.7 -charset-normalizer = 3.1.0 +certifi = 2023.7.22 +charset-normalizer = 3.2.0 collective.recipe.template = 2.2 -# sphinx-rtd-theme 1.2.2 requires docutils<19 +# 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 = 5.1.0 +# XXX importlib-metadata 6.8.0 requires Python 3.8 +importlib-metadata = 6.8.0 mr.developer = 2.0.1 packaging = 23.1 plone.recipe.command = 1.1 requests = 2.31.0 snowballstemmer = 2.2.0 -sphinx-rtd-theme = 1.2.2 -sphinxcontrib-applehelp = 1.0.4 -sphinxcontrib-devhelp = 1.0.2 -sphinxcontrib-htmlhelp = 2.0.1 +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.3 -sphinxcontrib-serializinghtml = 1.1.5 +sphinxcontrib-qthelp = 1.0.6 +sphinxcontrib-serializinghtml = 1.1.9 tempstorage = 6.0 -urllib3 = 2.0.3 +urllib3 = 2.0.4 z3c.checkversions = 2.1 zc.recipe.testrunner = 3.0 zipp = 3.16.2