stack/erp5: version up Zope 4.8.3

stack/erp5/buildout.cfg

@@ -2,8 +2,8 @@
 
 extends =
 # versions pins from zope, vendored with
-# curl https://zopefoundation.github.io/Zope/releases/4.8.2/versions.cfg | sed -e s/versions-prod.cfg/zope-versions.cfg/g > ztk-versions.cfg
-# curl https://zopefoundation.github.io/Zope/releases/4.8.2/versions-prod.cfg > zope-versions.cfg
+# curl https://zopefoundation.github.io/Zope/releases/4.8.3/versions.cfg | sed -e s/versions-prod.cfg/zope-versions.cfg/g > ztk-versions.cfg
+# curl https://zopefoundation.github.io/Zope/releases/4.8.3/versions-prod.cfg > zope-versions.cfg
   ztk-versions.cfg
   zope-versions.cfg
   buildout.hash.cfg
@@ -724,12 +724,6 @@ Acquisition-patches =  ${:_profile_base_location_}/../../component/egg-patch/Acq
 Acquisition-patch-options = -p1
 python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
 python-magic-patch-options = -p1
-# Zope 4 patches
-Zope-patches =
-  https://github.com/zopefoundation/Zope/commit/ce59c3266cdd19fdb8a7456fd55b3385d50a4ab0.patch#33be66d71933c5d35b5c238e44cef160
-  https://github.com/zopefoundation/Zope/commit/337bc76e0695f09fca97527514bcf29c104e33b8.patch#d6d55cf47754dcdf8022adcf11d3f1f6
-  https://github.com/zopefoundation/Zope/commit/68f0c122cf938c3e6184185cd8519e26ff7d0b14.patch#5a2c9c31caaaba75677507ddb3a0becc
-Zope-patch-options = -p1
 # backported security patches for waitress-1.4.4 from Debian 1.4.4-1.1+deb11u1 package.
 waitress-patches =
   ${:_profile_base_location_}/../../component/egg-patch/waitress/CVE-2022-24761-1.patch#a0508880f24662e48a20ce3bcbf440c2
@@ -790,7 +784,6 @@ pysvn = 1.9.15+SlapOSPatched001
 python-ldap = 2.4.32+SlapOSPatched001
 python-magic = 0.4.12+SlapOSPatched001
 PyPDF2 = 1.26.0+SlapOSPatched001
-Zope = 4.8.2+SlapOSPatched003
 waitress = 1.4.4+SlapOSPatched006
 ## https://lab.nexedi.com/nexedi/slapos/merge_requests/648
 pylint = 1.4.4+SlapOSPatched002
@@ -870,7 +863,6 @@ zbarlight = 2.3
 cloudpickle = 0.5.3
 dask = 0.18.1
 toolz = 0.9.0
-zope.globalrequest = 1.5
 fpconst = 0.7.2
 graphviz = 0.5.2
 olefile = 0.44

stack/erp5/zope-versions.cfg

@@ -2,7 +2,7 @@
 # Version pins for required and commonly used dependencies.
 
 [versions]
-Zope = 4.8.2
+Zope = 4.8.3
 Zope2 = 4.0
 # AccessControl 5+ no longer supports Zope 4.
 AccessControl = 4.3
@@ -30,13 +30,13 @@ ZConfig = 3.6.0
 ZEO = 5.3.0
 ZODB = 5.7.0
 five.globalrequest = 99.1
-five.localsitemanager = 3.2.2
+five.localsitemanager = 3.3
 funcsigs = 1.0.2
 future = 0.18.2
 ipaddress = 1.0.23
 mock = 4.0.3
 multipart = 0.2.4
-pbr = 5.8.1
+pbr = 5.9.0
 persistent = 4.9.0
 pytz = 2022.1
 roman = 3.3
@@ -48,23 +48,23 @@ z3c.pt = 3.3.1
 zExceptions = 4.2
 zc.lockfile = 2.0
 zdaemon = 4.3
-zodbpickle = 2.2.0
+zodbpickle = 2.3
 zope.annotation = 4.7.0
-zope.browser = 2.3
+zope.browser = 2.4
 zope.browsermenu = 4.4
 zope.browserpage = 4.4.0
 zope.browserresource = 4.4
 zope.cachedescriptors = 4.3.1
 zope.component = 5.0.1
 zope.componentvocabulary = 2.3.0
-zope.configuration = 4.4.0
+zope.configuration = 4.4.1
 zope.container = 4.5.0
 zope.contentprovider = 4.2.1
 zope.contenttype = 4.5.0
 zope.datetime = 4.3.0
 zope.deferredimport = 4.4
 zope.deprecation = 4.4.0
-zope.dottedname = 4.3
+zope.dottedname = 5.0
 zope.event = 4.5.0
 zope.exceptions = 4.5
 zope.filerepresentation = 5.0.0
@@ -74,7 +74,7 @@ zope.hookable = 5.1.0
 zope.i18n = 4.9.0
 zope.i18nmessageid = 5.0.1
 zope.interface = 5.4.0
-zope.lifecycleevent = 4.3.0
+zope.lifecycleevent = 4.4
 zope.location = 4.2
 zope.pagetemplate = 4.6.0
 zope.processlifetime = 2.3.0
@@ -83,7 +83,7 @@ zope.ptresource = 4.3.0
 zope.publisher = 6.1.0
 zope.ramcache = 2.4
 zope.schema = 6.2.0
-zope.security = 5.2
+zope.security = 5.3
 zope.sendmail = 5.2
 zope.sequencesort = 4.2
 zope.site = 4.5.0
@@ -112,6 +112,8 @@ mock = 3.0.5
 multipart = 0.1.1
 # waitress 2 requires Python 3.6 or higher
 waitress = 1.4.4
+# zope.dottedname >= 5 requires Python 3.6 or higher
+zope.dottedname = 4.3
 
 [versions:python35]
 # DocumentTemplate 4+ cannot be installed on Zope 4 for Python 3.5
@@ -124,6 +126,8 @@ WebTest = 2.0.35
 mock = 3.0.5
 # waitress 2 requires Python 3.6 or higher
 waitress = 1.4.4
+# zope.dottedname >= 5 requires Python 3.6 or higher
+zope.dottedname = 4.3
 
 [versions:python36]
 # WSGIProxy 0.5 and up requires Python 3.7 and up

stack/erp5/ztk-versions.cfg

@@ -5,33 +5,34 @@ versions = versions
 
 [versions]
 # Version pins for development and optional dependencies.
-Babel = 2.9.1
-Jinja2 = 3.1.1
+Babel = 2.10.1
+Jinja2 = 3.1.2
 MarkupSafe = 2.1.1
-Pygments = 2.11.2
-Sphinx = 4.5.0
+Pygments = 2.12.0
+Sphinx = 5.0.0
 alabaster = 0.7.12
 backports.functools-lru-cache = 1.6.4
 beautifulsoup4 = 4.11.1
 certifi = 2021.10.8
 cffi = 1.15.0
 chardet = 4.0.0
-charset-normalizer = 2.0.4
+charset-normalizer = 2.0.12
 collective.recipe.template = 2.2
 # sphinx-rtd-theme requires docutils <18
 docutils = 0.17.1
 idna = 3.3
 imagesize = 1.3.0
+importlib-metadata = 4.12.0
 mr.developer = 2.0.1
 packaging = 21.3
 plone.recipe.command = 1.1
-pyparsing = 3.0.8
+pyparsing = 3.0.9
 pycparser = 2.21
 python-gettext = 4.0
 requests = 2.27.1
 singledispatch = 3.7.0
 snowballstemmer = 2.2.0
-soupsieve = 2.3.2
+soupsieve = 2.3.2.post1
 sphinx-rtd-theme = 1.0.0
 sphinxcontrib-applehelp = 1.0.2
 sphinxcontrib-devhelp = 1.0.2
@@ -44,13 +45,17 @@ sphinxcontrib-websupport = 1.2.4
 # ZConfig xml configurations, which still contain references to it
 tempstorage = 5.2
 typing = 3.10.0.0
+typing-extensions = 4.1.1
 urllib3 = 1.26.9
 z3c.checkversions = 1.2
 zc.recipe.egg = 2.0.7
 zc.recipe.testrunner = 2.2
 zodbupdate = 1.5
+zipp = 3.8.1
 
 [versions:python27]
+# Babel 2.10 requires Python 3.6
+Babel = 2.9.1
 # Jinja2 3 and up needs Python 3.6 or higher
 Jinja2 = 2.11.3
 # MarkupSafe 2+ needs Python 3.6 or higher
@@ -75,14 +80,20 @@ pyparsing = 2.4.7
 soupsieve = 1.9.6
 
 [versions:python35]
+# Babel 2.10 requires Python 3.6
+Babel = 2.9.1
 # Jinja2 3 and up needs Python 3.6 or higher
 Jinja2 = 2.11.3
 # MarkupSafe 2+ needs Python 3.6 or higher
 MarkupSafe = 1.1.1
+# Pygments version 2.12 requires Python 3.6
+Pygments = 2.11.2
 # Version 4 needs Python 3.6 or higher
 Sphinx = 3.5.4
 # beautifulsoup4 4.11 and up requires Python 3.6
 beautifulsoup4 = 4.10.0
+# certifi 2022 dropped support for Python 3.5
+certifi = 2021.10.8
 # cffi 1.15 dropped support for Python 3.5
 cffi = 1.14.6
 # packaging 21 and up requires Python 3.6
@@ -91,9 +102,13 @@ packaging = 20.9
 pyparsing = 2.4.7
 # soupsieve 2.2 needs Python 3.6
 soupsieve = 2.1
+# Sphinx==3.5.4 requires docutils < 0.17
+docutils = 0.16
 
 [versions:python36]
 # Jinja2 3.1 and up needs Python 3.7 or higher
 Jinja2 = 3.0.3
 # MarkupSafe 2.1 needs Python 3.7 or higher
 MarkupSafe = 2.0.1
+# soupsieve 2.3.2 droppen Python 3.6 support
+soupsieve = 2.3.1