- vb and update dependencies where still possible

CHANGES.rst

@@ -6,6 +6,11 @@ These are all the changes in Zope 4, starting with the alpha releases.
 The change log for the previous version, Zope 2.13, is at
 https://zope.readthedocs.io/en/2.13/CHANGES.html
 
+4.7.1 (unreleased)
+------------------
+
+- Update dependencies to the latest releases that still support Python 2.
+
 
 4.7 (2022-01-09)
 ----------------

constraints.txt

@@ -1,5 +1,5 @@
 AccessControl==4.3
-Acquisition==4.8
+Acquisition==4.10
 AuthEncoding==4.3
 BTrees==4.9.2
 Chameleon==3.9.1
@@ -14,12 +14,12 @@ Persistence==3.1
 Products.BTreeFolder2==4.3
 Products.ZCatalog==5.2
 Record==3.5
-RestrictedPython==5.1
+RestrictedPython==5.2
 WSGIProxy2==0.4.6
 WebOb==1.8.7
 WebTest==2.0.35
 ZConfig==3.6.0
-ZEO==5.2.2
+ZEO==5.2.3
 ZODB==5.6.0
 ZServer==4.0.2 ; python_version < '3.0'
 Zope2==4.0
@@ -30,63 +30,63 @@ future==0.18.2
 ipaddress==1.0.23
 mock==3.0.5
 multipart==0.1.1
-pbr==5.6.0
+pbr==5.8.0
 persistent==4.7.0
-pytz==2021.1
+pytz==2021.3
 roman==3.3
 shutilwhich==1.1.0
 six==1.16.0
 transaction==3.0.1
 waitress==1.4.4
-z3c.pt==3.3.0
-zExceptions==4.1
+z3c.pt==3.3.1
+zExceptions==4.2
 zc.lockfile==2.0
 zdaemon==4.3
-zodbpickle==2.0.0
+zodbpickle==2.2.0
 zope.annotation==4.7.0
 zope.browser==2.3
 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.2.0
+zope.componentvocabulary==2.3.0
 zope.configuration==4.4.0
-zope.container==4.4.0
+zope.container==4.5.0
 zope.contentprovider==4.2.1
 zope.contenttype==4.5.0
 zope.datetime==4.3.0
-zope.deferredimport==4.3.1
+zope.deferredimport==4.4
 zope.deprecation==4.4.0
 zope.dottedname==4.3
 zope.event==4.5.0
 zope.exceptions==4.4
 zope.filerepresentation==5.0.0
-zope.formlib==4.7.1
+zope.formlib==5.0.1
 zope.globalrequest==1.5
 zope.hookable==5.1.0
-zope.i18n==4.7.0
+zope.i18n==4.9.0
 zope.i18nmessageid==5.0.1
 zope.interface==5.4.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
-zope.pagetemplate==4.5.0
+zope.pagetemplate==4.6.0
 zope.processlifetime==2.3.0
-zope.proxy==4.4.0
-zope.ptresource==4.2.0
+zope.proxy==4.5.0
+zope.ptresource==4.3.0
 zope.publisher==6.0.2
-zope.ramcache==2.3
-zope.schema==6.1.0
+zope.ramcache==2.4
+zope.schema==6.2.0
 zope.security==5.1.1
 zope.sendmail==5.2
-zope.sequencesort==4.1.2
+zope.sequencesort==4.2
 zope.site==4.5.0
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.5
 zope.tales==5.1
 zope.testbrowser==5.5.1
 zope.testing==4.7
-zope.testrunner==5.3.0
+zope.testrunner==5.4.0
 zope.traversing==4.4.1
 zope.viewlet==4.2.1

requirements-full.txt

@@ -1,6 +1,6 @@
-Zope==4.7
+Zope==<5
 AccessControl==4.3
-Acquisition==4.8
+Acquisition==4.10
 AuthEncoding==4.3
 BTrees==4.9.2
 Chameleon==3.9.1
@@ -15,12 +15,12 @@ Persistence==3.1
 Products.BTreeFolder2==4.3
 Products.ZCatalog==5.2
 Record==3.5
-RestrictedPython==5.1
+RestrictedPython==5.2
 WSGIProxy2==0.4.6
 WebOb==1.8.7
 WebTest==2.0.35
 ZConfig==3.6.0
-ZEO==5.2.2
+ZEO==5.2.3
 ZODB==5.6.0
 Zope2==4.0
 five.globalrequest==99.1
@@ -30,63 +30,63 @@ future==0.18.2
 ipaddress==1.0.23
 mock==3.0.5
 multipart==0.1.1
-pbr==5.6.0
+pbr==5.8.0
 persistent==4.7.0
-pytz==2021.1
+pytz==2021.3
 roman==3.3
 shutilwhich==1.1.0
 six==1.16.0
 transaction==3.0.1
 waitress==1.4.4
-z3c.pt==3.3.0
-zExceptions==4.1
+z3c.pt==3.3.1
+zExceptions==4.2
 zc.lockfile==2.0
 zdaemon==4.3
-zodbpickle==2.0.0
+zodbpickle==2.2.0
 zope.annotation==4.7.0
 zope.browser==2.3
 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.2.0
+zope.componentvocabulary==2.3.0
 zope.configuration==4.4.0
-zope.container==4.4.0
+zope.container==4.5.0
 zope.contentprovider==4.2.1
 zope.contenttype==4.5.0
 zope.datetime==4.3.0
-zope.deferredimport==4.3.1
+zope.deferredimport==4.4
 zope.deprecation==4.4.0
 zope.dottedname==4.3
 zope.event==4.5.0
 zope.exceptions==4.4
 zope.filerepresentation==5.0.0
-zope.formlib==4.7.1
+zope.formlib==5.0.1
 zope.globalrequest==1.5
 zope.hookable==5.1.0
-zope.i18n==4.7.0
+zope.i18n==4.9.0
 zope.i18nmessageid==5.0.1
 zope.interface==5.4.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
-zope.pagetemplate==4.5.0
+zope.pagetemplate==4.6.0
 zope.processlifetime==2.3.0
-zope.proxy==4.4.0
-zope.ptresource==4.2.0
+zope.proxy==4.5.0
+zope.ptresource==4.3.0
 zope.publisher==6.0.2
-zope.ramcache==2.3
-zope.schema==6.1.0
+zope.ramcache==2.4
+zope.schema==6.2.0
 zope.security==5.1.1
 zope.sendmail==5.2
-zope.sequencesort==4.1.2
+zope.sequencesort==4.2
 zope.site==4.5.0
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.5
 zope.tales==5.1
 zope.testbrowser==5.5.1
 zope.testing==4.7
-zope.testrunner==5.3.0
+zope.testrunner==5.4.0
 zope.traversing==4.4.1
 zope.viewlet==4.2.1

setup.py

@@ -29,7 +29,7 @@ def _read_file(filename):
 README = _read_file('README.rst')
 CHANGES = _read_file('CHANGES.rst')
 
-version = '4.7'
+version = '4.7.1.dev0'
 
 
 setup(

versions-prod.cfg

@@ -2,11 +2,11 @@
 # Version pins for required and commonly used dependencies.
 
 [versions]
-Zope = 4.7
+Zope = <5
 Zope2 = 4.0
 # AccessControl 5+ no longer supports Zope 4.
 AccessControl = 4.3
-Acquisition = 4.8
+Acquisition = 4.10
 AuthEncoding = 4.3
 BTrees = 4.9.2
 Chameleon = 3.9.1
@@ -23,12 +23,14 @@ Products.BTreeFolder2 = 4.3
 # ZCatalog 6+ no longer supports Zope 4.
 Products.ZCatalog = 5.2
 Record = 3.5
-RestrictedPython = 5.1
+RestrictedPython = 5.2
+# WSGIProxy 0.5 and up requires Python 3
 WSGIProxy2 = 0.4.6
 WebOb = 1.8.7
+# WebTest 3.0 and up requires Python 3
 WebTest = 2.0.35
 ZConfig = 3.6.0
-ZEO = 5.2.2
+ZEO = 5.2.3
 ZODB = 5.6.0
 ZServer = 4.0.2
 five.globalrequest = 99.1
@@ -40,57 +42,57 @@ ipaddress = 1.0.23
 mock = 3.0.5
 # multipart 0.2 and up requires Python 3
 multipart = 0.1.1
-pbr = 5.6.0
+pbr = 5.8.0
 persistent = 4.7.0
-pytz = 2021.1
+pytz = 2021.3
 roman = 3.3
 shutilwhich = 1.1.0
 six = 1.16.0
 transaction = 3.0.1
 # waitress 2 requires Python 3.6 or higher
 waitress = 1.4.4
-z3c.pt = 3.3.0
-zExceptions = 4.1
+z3c.pt = 3.3.1
+zExceptions = 4.2
 zc.lockfile = 2.0
 zdaemon = 4.3
-zodbpickle = 2.0.0
+zodbpickle = 2.2.0
 zope.annotation = 4.7.0
 zope.browser = 2.3
 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.2.0
+zope.componentvocabulary = 2.3.0
 zope.configuration = 4.4.0
-zope.container = 4.4.0
+zope.container = 4.5.0
 zope.contentprovider = 4.2.1
 zope.contenttype = 4.5.0
 zope.datetime = 4.3.0
-zope.deferredimport = 4.3.1
+zope.deferredimport = 4.4
 zope.deprecation = 4.4.0
 zope.dottedname = 4.3
 zope.event = 4.5.0
 zope.exceptions = 4.4
 zope.filerepresentation = 5.0.0
-zope.formlib = 4.7.1
+zope.formlib = 5.0.1
 zope.globalrequest = 1.5
 zope.hookable = 5.1.0
-zope.i18n = 4.7.0
+zope.i18n = 4.9.0
 zope.i18nmessageid = 5.0.1
 zope.interface = 5.4.0
 zope.lifecycleevent = 4.3.0
 zope.location = 4.2
-zope.pagetemplate = 4.5.0
+zope.pagetemplate = 4.6.0
 zope.processlifetime = 2.3.0
-zope.proxy = 4.4.0
-zope.ptresource = 4.2.0
+zope.proxy = 4.5.0
+zope.ptresource = 4.3.0
 zope.publisher = 6.0.2
-zope.ramcache = 2.3
-zope.schema = 6.1.0
+zope.ramcache = 2.4
+zope.schema = 6.2.0
 zope.security = 5.1.1
 zope.sendmail = 5.2
-zope.sequencesort = 4.1.2
+zope.sequencesort = 4.2
 zope.site = 4.5.0
 zope.size = 4.3
 zope.structuredtext = 4.3
@@ -99,6 +101,6 @@ zope.tales = 5.1
 zope.testbrowser = 5.5.1
 # Version 4.8+ dropped support for Python 3.5
 zope.testing = 4.7
-zope.testrunner = 5.3.0
+zope.testrunner = 5.4.0
 zope.traversing = 4.4.1
 zope.viewlet = 4.2.1