Clean up and refactor version pin configurations (#1092)

* - clean up and refactor version pin configurations

* - incorporate feedback from Maurits

.meta.toml

@@ -75,7 +75,6 @@ additional-rules = [
     "include sources.cfg",
     "include versions-prod.cfg",
     "include versions.cfg",
-    "include zope-ecosystem.cfg",
     "recursive-include docs *.bat",
     "recursive-include docs *.css",
     "recursive-include docs *.jpg",

CHANGES.rst

@@ -10,6 +10,8 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 5.8.1 (unreleased)
 ------------------
 
+- Clean out and refactor dependency configuration files.
+
 - Update to newest compatible versions of dependencies.
 
 

MANIFEST.in

@@ -17,7 +17,6 @@ include *.yaml
 include sources.cfg
 include versions-prod.cfg
 include versions.cfg
-include zope-ecosystem.cfg
 recursive-include docs *.bat
 recursive-include docs *.css
 recursive-include docs *.jpg

buildout.cfg

@@ -10,7 +10,6 @@ parts =
     test
     zopescripts
     alltests
-    ztktests
     allpy
     sphinx
     checkversions
@@ -38,7 +37,6 @@ recipe = zc.recipe.egg
 interpreter = zopepy
 eggs =
     Zope[wsgi]
-    zodbupdate
 
 
 [alltests]
@@ -63,63 +61,10 @@ eggs =
     Record
 
 
-[ztktests]
-recipe = zc.recipe.testrunner
-script = ztktests
-eggs =
-    zope.annotation
-    zope.browser
-    zope.browsermenu
-    zope.browserpage
-    zope.browserresource
-    zope.cachedescriptors
-    zope.component
-    zope.componentvocabulary
-    zope.configuration
-    zope.container
-    zope.contentprovider
-    zope.contenttype
-    zope.datetime
-    zope.deferredimport
-    zope.deprecation
-    zope.dottedname
-    zope.event
-    zope.exceptions
-    zope.filerepresentation
-    zope.formlib
-    zope.globalrequest
-    zope.i18n
-    zope.i18nmessageid
-    zope.interface
-    zope.lifecycleevent
-    zope.location
-    zope.pagetemplate
-    zope.processlifetime
-    zope.proxy
-    zope.ptresource
-    zope.publisher
-    zope.ramcache
-    zope.schema
-    zope.security
-    zope.sendmail
-    zope.sequencesort
-    zope.site[test]
-    zope.size
-    zope.structuredtext
-    zope.tal
-    zope.tales
-    zope.testbrowser[test]
-    zope.testing
-    zope.testrunner
-    zope.traversing
-    zope.viewlet
-
-
 [allpy]
 recipe = zc.recipe.egg
 eggs = ${alltests:eggs}
 interpreter = allpy
-scripts = allpy
 
 
 [make-docs]

constraints.txt

@@ -6,44 +6,34 @@ Chameleon==3.10.2
 DateTime==4.9
 DocumentTemplate==4.3
 ExtensionClass==4.9
-Missing==4.2
 MultiMapping==4.1
 Paste==3.5.2
 PasteDeploy==2.1.1; python_version == '3.7'
 PasteDeploy==3.0.1; python_version > '3.7'
 Persistence==3.6
-Products.BTreeFolder2==4.4
-Products.ZCatalog==6.4
-Record==3.6
 RestrictedPython==6.0
-SecretStorage==3.3.3
 WSGIProxy2==0.5.1
 WebOb==1.8.7
 WebTest==3.0.0
 ZConfig==3.6.1
-ZEO==5.3.0
 ZODB==5.8.0
 Zope2==4.0
-cryptography==39.0.0
-five.localsitemanager==3.4
-funcsigs==1.0.2
-future==0.18.2
-ipaddress==1.0.23
-jeepney==0.8.0
-mock==5.0.1
+beautifulsoup4==4.11.1
+cffi==1.15.1
 multipart==0.2.4
-pbr==5.11.0
 persistent==5.0
+pycparser==2.21
+python-gettext==4.1
 pytz==2022.7
 roman==3.3
-shutilwhich==1.1.0
 six==1.16.0
+soupsieve==2.3.2.post1
 transaction==3.0.1
 waitress==2.1.2
 z3c.pt==3.3.1
 zExceptions==4.3
 zc.lockfile==2.0
-zdaemon==4.4
+zc.recipe.egg==2.0.7
 zodbpickle==2.6
 zope.annotation==4.8
 zope.browser==2.4
@@ -52,7 +42,6 @@ zope.browserpage==4.4.0
 zope.browserresource==4.4
 zope.cachedescriptors==4.4
 zope.component==5.1.0
-zope.componentvocabulary==2.3.0
 zope.configuration==4.4.1
 zope.container==4.10
 zope.contentprovider==4.2.1
@@ -64,7 +53,6 @@ zope.dottedname==5.0
 zope.event==4.6
 zope.exceptions==4.6
 zope.filerepresentation==5.0.0
-zope.formlib==5.0.1
 zope.globalrequest==1.6
 zope.hookable==5.4
 zope.i18n==4.9.0
@@ -77,10 +65,8 @@ zope.processlifetime==2.4
 zope.proxy==4.6.1
 zope.ptresource==4.3.0
 zope.publisher==6.1.0
-zope.ramcache==2.4
 zope.schema==7.0.1
 zope.security==5.8
-zope.sendmail==5.3
 zope.sequencesort==4.2
 zope.site==4.6.1
 zope.size==4.4
@@ -89,6 +75,5 @@ zope.tal==4.5
 zope.tales==5.2
 zope.testbrowser==5.6.1
 zope.testing==5.0.1
-zope.testrunner==5.6
 zope.traversing==4.4.1
 zope.viewlet==4.3

requirements-full.txt

@@ -7,44 +7,34 @@ Chameleon==3.10.2
 DateTime==4.9
 DocumentTemplate==4.3
 ExtensionClass==4.9
-Missing==4.2
 MultiMapping==4.1
 Paste==3.5.2
 PasteDeploy==2.1.1; python_version == '3.7'
 PasteDeploy==3.0.1; python_version > '3.7'
 Persistence==3.6
-Products.BTreeFolder2==4.4
-Products.ZCatalog==6.4
-Record==3.6
 RestrictedPython==6.0
-SecretStorage==3.3.3
 WSGIProxy2==0.5.1
 WebOb==1.8.7
 WebTest==3.0.0
 ZConfig==3.6.1
-ZEO==5.3.0
 ZODB==5.8.0
 Zope2==4.0
-cryptography==39.0.0
-five.localsitemanager==3.4
-funcsigs==1.0.2
-future==0.18.2
-ipaddress==1.0.23
-jeepney==0.8.0
-mock==5.0.1
+beautifulsoup4==4.11.1
+cffi==1.15.1
 multipart==0.2.4
-pbr==5.11.0
 persistent==5.0
+pycparser==2.21
+python-gettext==4.1
 pytz==2022.7
 roman==3.3
-shutilwhich==1.1.0
 six==1.16.0
+soupsieve==2.3.2.post1
 transaction==3.0.1
 waitress==2.1.2
 z3c.pt==3.3.1
 zExceptions==4.3
 zc.lockfile==2.0
-zdaemon==4.4
+zc.recipe.egg==2.0.7
 zodbpickle==2.6
 zope.annotation==4.8
 zope.browser==2.4
@@ -53,7 +43,6 @@ zope.browserpage==4.4.0
 zope.browserresource==4.4
 zope.cachedescriptors==4.4
 zope.component==5.1.0
-zope.componentvocabulary==2.3.0
 zope.configuration==4.4.1
 zope.container==4.10
 zope.contentprovider==4.2.1
@@ -65,7 +54,6 @@ zope.dottedname==5.0
 zope.event==4.6
 zope.exceptions==4.6
 zope.filerepresentation==5.0.0
-zope.formlib==5.0.1
 zope.globalrequest==1.6
 zope.hookable==5.4
 zope.i18n==4.9.0
@@ -78,10 +66,8 @@ zope.processlifetime==2.4
 zope.proxy==4.6.1
 zope.ptresource==4.3.0
 zope.publisher==6.1.0
-zope.ramcache==2.4
 zope.schema==7.0.1
 zope.security==5.8
-zope.sendmail==5.3
 zope.sequencesort==4.2
 zope.site==4.6.1
 zope.size==4.4
@@ -90,6 +76,5 @@ zope.tal==4.5
 zope.tales==5.2
 zope.testbrowser==5.6.1
 zope.testing==5.0.1
-zope.testrunner==5.6
 zope.traversing==4.4.1
 zope.viewlet==4.3

versions-prod.cfg

@@ -12,42 +12,32 @@ Chameleon = 3.10.2
 DateTime = 4.9
 DocumentTemplate = 4.3
 ExtensionClass = 4.9
-Missing = 4.2
 MultiMapping = 4.1
 Paste = 3.5.2
 PasteDeploy = 3.0.1
 Persistence = 3.6
-Products.BTreeFolder2 = 4.4
-Products.ZCatalog = 6.4
-Record = 3.6
 RestrictedPython = 6.0
-SecretStorage = 3.3.3
+WebTest = 3.0.0
 WSGIProxy2 = 0.5.1
 WebOb = 1.8.7
-WebTest = 3.0.0
 ZConfig = 3.6.1
-ZEO = 5.3.0
 ZODB = 5.8.0
-cryptography = 39.0.0
-five.localsitemanager = 3.4
-funcsigs = 1.0.2
-future = 0.18.2
-ipaddress = 1.0.23
-jeepney = 0.8.0
-mock = 5.0.1
+beautifulsoup4 = 4.11.1
+cffi = 1.15.1
 multipart = 0.2.4
-pbr = 5.11.0
 persistent = 5.0
+pycparser = 2.21
+python-gettext = 4.1
 pytz = 2022.7
-roman = 3.3
-shutilwhich = 1.1.0
 six = 1.16.0
+roman = 3.3
+soupsieve = 2.3.2.post1
 transaction = 3.0.1
 waitress = 2.1.2
 z3c.pt = 3.3.1
 zExceptions = 4.3
 zc.lockfile = 2.0
-zdaemon = 4.4
+zc.recipe.egg = 2.0.7
 zodbpickle = 2.6
 zope.annotation = 4.8
 zope.browser = 2.4
@@ -56,7 +46,6 @@ zope.browserpage = 4.4.0
 zope.browserresource = 4.4
 zope.cachedescriptors = 4.4
 zope.component = 5.1.0
-zope.componentvocabulary = 2.3.0
 zope.configuration = 4.4.1
 zope.container = 4.10
 zope.contentprovider = 4.2.1
@@ -68,7 +57,6 @@ zope.dottedname = 5.0
 zope.event = 4.6
 zope.exceptions = 4.6
 zope.filerepresentation = 5.0.0
-zope.formlib = 5.0.1
 zope.globalrequest = 1.6
 zope.hookable = 5.4
 zope.i18n = 4.9.0
@@ -81,10 +69,8 @@ zope.processlifetime = 2.4
 zope.proxy = 4.6.1
 zope.ptresource = 4.3.0
 zope.publisher = 6.1.0
-zope.ramcache = 2.4
 zope.schema = 7.0.1
 zope.security = 5.8
-zope.sendmail = 5.3
 zope.sequencesort = 4.2
 zope.site = 4.6.1
 zope.size = 4.4
@@ -93,7 +79,6 @@ zope.tal = 4.5
 zope.tales = 5.2
 zope.testbrowser = 5.6.1
 zope.testing = 5.0.1
-zope.testrunner = 5.6
 zope.traversing = 4.4.1
 zope.viewlet = 4.3