Drop non-direct dependencies from setup.py.

CHANGES.rst

@@ -8,6 +8,24 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
 4.0a2 (unreleased)
 ------------------
 
+Bugs Fixed
+++++++++++
+
+Features Added
+++++++++++++++
+
+Restructuring
++++++++++++++
+
+- Dropped dependency declarations for indirect dependencies:
+
+    ``docutils``
+    ``Missing``
+    ``pytz``
+    ``zLOG``
+    ``zope.sendmail``
+    ``zope.structuredtext``
+
 
 4.0a1 (2016-07-22)
 ------------------
@@ -218,13 +236,14 @@ Restructuring
 - Dropped the direct dependencies on packages that have been factored out of
   the main Zope 2 tree. Make sure you declare a dependency in your own
   distribution if you still use one of these:
-    - ``Products.BTreeFolder2``
-    - ``Products.ExternalMethod``
-    - ``Products.MailHost``
-    - ``Products.MIMETools``
-    - ``Products.PythonScripts``
-    - ``Products.SiteErrorLog``
-    - ``Products.StandardCacheManagers``
-    - ``Products.ZCatalog``
-    - ``Products.ZCTextIndex``
-    - ``Record``
+
+    ``Products.BTreeFolder2``
+    ``Products.ExternalMethod``
+    ``Products.MailHost``
+    ``Products.MIMETools``
+    ``Products.PythonScripts``
+    ``Products.SiteErrorLog``
+    ``Products.StandardCacheManagers``
+    ``Products.ZCatalog``
+    ``Products.ZCTextIndex``
+    ``Record``

buildout.cfg

@@ -50,7 +50,6 @@ eggs =
     DocumentTemplate
     ExtensionClass
     five.globalrequest
-    Missing
     MultiMapping
     Persistence
     Products.OFSP
@@ -60,9 +59,9 @@ eggs =
     RestrictedPython
     tempstorage
     zExceptions
-    zLOG
     ZopeUndo
 # Test optional dependencies.
+    Missing
     Products.BTreeFolder2
     Products.ExternalMethod
     Products.MailHost
@@ -72,6 +71,7 @@ eggs =
     Products.ZCatalog
     Products.ZCTextIndex
     Record
+    zLOG
 
 
 [ztktests]
@@ -98,23 +98,23 @@ eggs =
     zope.lifecycleevent
     zope.location
     zope.pagetemplate
-    zope.ptresource
     zope.proxy
     zope.processlifetime
+    zope.ptresource
     zope.publisher
-    zope.sendmail
     zope.schema
     zope.security
+    zope.sendmail
     zope.sequencesort
     zope.site[test]
     zope.size
     zope.structuredtext
     zope.tal
     zope.tales
-    zope.traversing
     zope.testbrowser[test]
     zope.testing
     zope.testrunner
+    zope.traversing
     zope.viewlet
 
 

requirements.txt

@@ -26,18 +26,15 @@ ZConfig==3.1.0
 ZEO==4.2.1
 ZODB==4.4.2
 ZopeUndo==4.1
-docutils==0.12
 five.globalrequest==1.0
 initgroups==3.0
 mechanize==0.2.5
 persistent==4.2.1
-python-gettext==3.0
 pytz==2016.6.1
 repoze.retry==1.4
 six==1.10.0
 tempstorage==3.0
 transaction==1.6.1
-unittest2==1.1.0
 waitress==0.9.0
 zExceptions==3.2
 zLOG==3.0

setup.py

@@ -55,7 +55,6 @@ setup(
         'DateTime',
         'DocumentTemplate',
         'ExtensionClass',
-        'Missing',
         'MultiMapping',
         'PasteDeploy',
         'Persistence',
@@ -64,9 +63,7 @@ setup(
         'ZConfig >= 2.9.2',
         'ZODB',
         'ZopeUndo',
-        'docutils',
         'five.globalrequest',
-        'pytz',
         'repoze.retry',
         'setuptools',
         'tempstorage',
@@ -74,7 +71,6 @@ setup(
         'waitress',
         'zdaemon',
         'zExceptions >= 3.2',
-        'zLOG',
         'zope.browser',
         'zope.browsermenu',
         'zope.browserpage >= 4.0',
@@ -99,11 +95,9 @@ setup(
         'zope.publisher',
         'zope.schema',
         'zope.security',
-        'zope.sendmail',
         'zope.sequencesort',
         'zope.site',
         'zope.size',
-        'zope.structuredtext',
         'zope.tal',
         'zope.tales >= 3.5.0',
         'zope.testbrowser',

sources.cfg

@@ -10,88 +10,64 @@ DateTime = git ${remotes:github}/DateTime pushurl=${remotes:github_push}/DateTim
 DocumentTemplate = git ${remotes:github}/DocumentTemplate pushurl=${remotes:github_push}/DocumentTemplate
 ExtensionClass = git ${remotes:github}/ExtensionClass pushurl=${remotes:github_push}/ExtensionClass
 five.globalrequest = git ${remotes:github}/five.globalrequest pushurl=${remotes:github_push}/five.globalrequest
-initgroups = git ${remotes:github}/initgroups pushurl=${remotes:github_push}/initgroups
-Missing = git ${remotes:github}/Missing pushurl=${remotes:github_push}/Missing
 MultiMapping = git ${remotes:github}/MultiMapping pushurl=${remotes:github_push}/MultiMapping
 Persistence = git ${remotes:github}/Persistence pushurl=${remotes:github_push}/Persistence
 Products.OFSP = git ${remotes:github}/Products.OFSP pushurl=${remotes:github_push}/Products.OFSP
-Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog branch=master
-Products.ZCTextIndex = git ${remotes:github}/Products.ZCTextIndex pushurl=${remotes:github_push}/Products.ZCTextIndex
-Record = git ${remotes:github}/Record pushurl=${remotes:github_push}/Record
 tempstorage = git ${remotes:github}/tempstorage pushurl=${remotes:github_push}/tempstorage
 zExceptions = git ${remotes:github}/zExceptions pushurl=${remotes:github_push}/zExceptions
-zLOG = git ${remotes:github}/zLOG pushurl=${remotes:github_push}/zLOG
 zope.globalrequest = git ${remotes:github}/zope.globalrequest pushurl=${remotes:github_push}/zope.globalrequest
 ZopeUndo = git ${remotes:github}/ZopeUndo pushurl=${remotes:github_push}/ZopeUndo
 
 # Optional dependencies
+initgroups = git ${remotes:github}/initgroups pushurl=${remotes:github_push}/initgroups
+Missing = git ${remotes:github}/Missing pushurl=${remotes:github_push}/Missing
 Products.BTreeFolder2 = git ${remotes:github}/Products.BTreeFolder2 pushurl=${remotes:github_push}/Products.BTreeFolder2
 Products.ExternalMethod = git ${remotes:github}/Products.ExternalMethod pushurl=${remotes:github_push}/Products.ExternalMethod
 Products.MailHost = git ${remotes:github}/Products.MailHost pushurl=${remotes:github_push}/Products.MailHost
 Products.PythonScripts = git ${remotes:github}/Products.PythonScripts pushurl=${remotes:github_push}/Products.PythonScripts
 Products.SiteErrorLog = git ${remotes:github}/Products.SiteErrorLog pushurl=${remotes:github_push}/Products.SiteErrorLog
 Products.StandardCacheManagers = git ${remotes:github}/Products.StandardCacheManagers pushurl=${remotes:github_push}/Products.StandardCacheManagers
+Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog branch=master
+Products.ZCTextIndex = git ${remotes:github}/Products.ZCTextIndex pushurl=${remotes:github_push}/Products.ZCTextIndex
+Record = git ${remotes:github}/Record pushurl=${remotes:github_push}/Record
+zLOG = git ${remotes:github}/zLOG pushurl=${remotes:github_push}/zLOG
 
 # ZTK
 zope.annotation = git ${remotes:github}/zope.annotation
-zope.applicationcontrol = git ${remotes:github}/zope.applicationcontrol
-zope.authentication = git ${remotes:github}/zope.authentication
 zope.browser = git ${remotes:github}/zope.browser
 zope.browsermenu = git ${remotes:github}/zope.browsermenu
 zope.browserpage = git ${remotes:github}/zope.browserpage
 zope.browserresource = git ${remotes:github}/zope.browserresource
-zope.cachedescriptors = git ${remotes:github}/zope.cachedescriptors
-zope.catalog = git ${remotes:github}/zope.catalog
 zope.component = git ${remotes:github}/zope.component
-zope.componentvocabulary = git ${remotes:github}/zope.componentvocabulary
 zope.configuration = git ${remotes:github}/zope.configuration
 zope.container = git ${remotes:github}/zope.container
 zope.contentprovider = git ${remotes:github}/zope.contentprovider
 zope.contenttype = git ${remotes:github}/zope.contenttype
-zope.copy = git ${remotes:github}/zope.copy
-zope.copypastemove = git ${remotes:github}/zope.copypastemove
-zope.datetime = git ${remotes:github}/zope.datetime
 zope.deferredimport = git ${remotes:github}/zope.deferredimport
-zope.deprecation = git ${remotes:github}/zope.deprecation
 zope.dottedname = git ${remotes:github}/zope.dottedname
-zope.dublincore = git ${remotes:github}/zope.dublincore
-zope.error = git ${remotes:github}/zope.error
 zope.event = git ${remotes:github}/zope.event
 zope.exceptions = git ${remotes:github}/zope.exceptions
 zope.filerepresentation = git ${remotes:github}/zope.filerepresentation
-zope.formlib = git ${remotes:github}/zope.formlib
-zope.hookable = git ${remotes:github}/zope.hookable
 zope.i18n = git ${remotes:github}/zope.i18n
 zope.i18nmessageid = git ${remotes:github}/zope.i18nmessageid
-zope.index = git ${remotes:github}/zope.index
 zope.interface = git ${remotes:github}/zope.interface
-zope.intid = git ${remotes:github}/zope.intid
-zope.keyreference = git ${remotes:github}/zope.keyreference
 zope.lifecycleevent = git ${remotes:github}/zope.lifecycleevent
 zope.location = git ${remotes:github}/zope.location
-zope.login = git ${remotes:github}/zope.login
-zope.mimetype = git ${remotes:github}/zope.mimetype
-zope.minmax = git ${remotes:github}/zope.minmax
 zope.pagetemplate = git ${remotes:github}/zope.pagetemplate
-zope.password = git ${remotes:github}/zope.password
-zope.pluggableauth = git ${remotes:github}/zope.pluggableauth
-zope.principalannotation = git ${remotes:github}/zope.principalannotation
-zope.principalregistry = git ${remotes:github}/zope.principalregistry
 zope.processlifetime = git ${remotes:github}/zope.processlifetime
 zope.proxy = git ${remotes:github}/zope.proxy
 zope.ptresource = git ${remotes:github}/zope.ptresource
 zope.publisher = git ${remotes:github}/zope.publisher
-zope.ramcache = git ${remotes:github}/zope.ramcache
 zope.schema = git ${remotes:github}/zope.schema
 zope.security = git ${remotes:github}/zope.security
-zope.securitypolicy = git ${remotes:github}/zope.securitypolicy
 zope.sendmail = git ${remotes:github}/zope.sendmail
-zope.session = git ${remotes:github}/zope.session
+zope.sequencesort = git ${remotes:github}/zope.sequencesort
 zope.site = git ${remotes:github}/zope.site
 zope.size = git ${remotes:github}/zope.size
 zope.structuredtext = git ${remotes:github}/zope.structuredtext
 zope.tal = git ${remotes:github}/zope.tal
 zope.tales = git ${remotes:github}/zope.tales
+zope.testbrowser = git ${remotes:github}/zope.testbrowser
 zope.testing = git ${remotes:github}/zope.testing
 zope.testrunner = git ${remotes:github}/zope.testrunner
 zope.traversing = git ${remotes:github}/zope.traversing

versions-prod.cfg

@@ -7,7 +7,6 @@ Acquisition = 4.2.2
 BTrees = 4.3.1
 DateTime = 4.1.1
 DocumentTemplate = 2.13.2
-docutils = 0.12
 ExtensionClass = 4.1.2
 five.globalrequest = 1.0
 initgroups = 3.0
@@ -26,7 +25,6 @@ Products.SiteErrorLog = 4.0
 Products.StandardCacheManagers = 3.0
 Products.ZCatalog = 4.0a1
 Products.ZCTextIndex = 3.0
-python-gettext = 3.0
 pytz = 2016.6.1
 Record = 3.1
 repoze.retry = 1.4
@@ -34,7 +32,6 @@ RestrictedPython = 3.6.0
 six = 1.10.0
 tempstorage = 3.0
 transaction = 1.6.1
-unittest2 = 1.1.0
 waitress = 0.9.0
 WebOb = 1.6.1
 WebTest = 2.0.23

versions.cfg

@@ -11,6 +11,7 @@ beautifulsoup4 = 4.5.0
 collective.recipe.cmd = 0.11
 collective.recipe.sphinxbuilder = 1.0
 coverage = 4.1
+docutils = 0.12
 extras = 1.0.0
 imagesize = 0.7.1
 Jinja2 = 2.8
@@ -20,11 +21,13 @@ mr.developer = 1.34
 nose = 1.3.7
 plone.recipe.command = 1.1
 Pygments = 2.1.3
+python-gettext = 3.0
 python-subunit = 1.2.0
 setuptools = 24.3.0
 snowballstemmer = 1.2.1
 Sphinx = 1.4.5
 testtools = 2.2.0
+unittest2 = 1.1.0
 z3c.checkversions = 0.5
 zc.buildout = 2.5.2
 zc.recipe.egg = 2.0.3