Merge pull request #53 from zopefoundation/tomgross-newerversion

use newer versions of everything (except zope.testbrowser)

buildout.cfg

@@ -23,6 +23,13 @@ parts =
     wsgi
 sources-dir = develop
 auto-checkout =
+    AccessControl
+    Products.BTreeFolder2
+    Products.ExternalMethod
+    Products.ZCatalog
+    Products.ZCTextIndex
+    tempstorage
+    zLOG
 
 
 [test]

setup.py

@@ -54,6 +54,7 @@ setup(name='Zope2',
     install_requires=[
       'AccessControl>=2.13.2',
       'Acquisition',
+      'BTrees',
       'DateTime',
       'DocumentTemplate',
       'ExtensionClass',
@@ -67,7 +68,7 @@ setup(name='Zope2',
       'Record',
       'RestrictedPython',
       'ZConfig >= 2.9.2',
-      'ZODB3',
+      'ZODB',
       'ZopeUndo',
       'docutils',
       'initgroups',

sources.cfg

@@ -7,7 +7,7 @@ github_push = git@github.com:zopefoundation
 
 [sources]
 # Zope2-specific
-AccessControl = git ${remotes:github}/AccessControl pushurl=${remotes:github_push}/AccessControl
+AccessControl = git ${remotes:github}/AccessControl pushurl=${remotes:github_push}/AccessControl branch=master
 Acquisition = git ${remotes:github}/Acquisition pushurl=${remotes:github_push}/Acquisition
 DateTime = git ${remotes:github}/DateTime pushurl=${remotes:github_push}/DateTime
 DocumentTemplate = git ${remotes:github}/DocumentTemplate pushurl=${remotes:github_push}/DocumentTemplate
@@ -18,7 +18,7 @@ MultiMapping = git ${remotes:github}/MultiMapping pushurl=${remotes:github_push}
 nt_svcutils = git ${remotes:github}/nt_svcutils pushurl=${remotes:github_push}/nt_svcutils
 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
+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

versions.cfg

@@ -5,7 +5,7 @@ versions = versions
 [versions]
 # Zope2-specific
 Zope2 =
-AccessControl = 3.0.11
+AccessControl = 3.0.12
 Acquisition = 4.2.2
 DateTime = 4.0.1
 DocumentTemplate = 2.13.2
@@ -25,7 +25,7 @@ zLOG = 2.12.0
 ZopeUndo = 4.0
 
 # Deprecated / CMF dependencies
-Products.BTreeFolder2 = 2.13.4
+Products.BTreeFolder2 = 2.14.0
 Products.ExternalMethod = 2.13.1
 Products.MailHost = 2.13.2
 Products.PythonScripts = 2.13.2
@@ -43,4 +43,8 @@ repoze.who = 2.2
 RestrictedPython = 3.6.0
 zope.sequencesort = 4.0.1
 zope.testbrowser = 3.11.1
-ZODB3 = 3.11.0
+ZODB = 4.2.0
+sphinx-rtd-theme = 0.1.9
+alabaster = 0.7.7
+Babel = 2.2.0
+snowballstemmer = 1.2.1

ztk-versions.cfg

 [versions]
 # ZTK
 zope.annotation = 4.4.1
-zope.applicationcontrol = 4.0.0
-zope.authentication = 4.2.0
+zope.applicationcontrol = 4.0.1
+zope.authentication = 4.2.1
 zope.browser = 2.1.0
-zope.browsermenu = 4.1.0
+zope.browsermenu = 4.1.1
 zope.browserpage = 4.1.0
 zope.browserresource = 4.1.0
 zope.cachedescriptors = 4.1.0
-zope.catalog = 4.0.0
-zope.component = 4.2.1
+zope.catalog = 4.1.0
+zope.component = 4.2.2
 zope.componentvocabulary = 2.0.0
 zope.configuration = 4.0.3
-zope.container = 4.0.0
+zope.container = 4.1.0
 zope.contentprovider = 4.0.0
 zope.contenttype = 4.1.0
 zope.copy = 4.0.3
@@ -23,15 +23,15 @@ zope.deprecation = 4.1.2
 zope.dottedname = 4.1.0
 zope.dublincore = 4.1.1
 zope.error = 4.2.0
-zope.event = 4.0.3
-zope.exceptions = 4.0.7
+zope.event = 4.1.0
+zope.exceptions = 4.0.8
 zope.filerepresentation = 4.1.0
 zope.formlib = 4.3.0
 zope.hookable = 4.0.4
-zope.i18n = 4.0.0
+zope.i18n = 4.1.0
 zope.i18nmessageid = 4.0.3
 zope.index = 4.1.0
-zope.interface = 4.1.2
+zope.interface = 4.1.3
 zope.intid = 4.1.0
 zope.keyreference = 4.1.0
 zope.lifecycleevent = 4.1.0
@@ -39,63 +39,63 @@ zope.location = 4.0.3
 zope.login = 2.0.0
 zope.mimetype = 2.0.0
 zope.minmax = 2.1.0
-zope.pagetemplate = 4.1.0
+zope.pagetemplate = 4.2.1
 zope.password = 4.1.0
 zope.pluggableauth = 2.0.0
-zope.principalannotation = 4.1.0
+zope.principalannotation = 4.1.1
 zope.principalregistry = 4.0.0
 zope.processlifetime = 2.1.0
-zope.proxy = 4.1.4
+zope.proxy = 4.1.6
 zope.ptresource = 4.0.0
-zope.publisher = 4.1.0
+zope.publisher = 4.2.2
 zope.ramcache = 2.1.0
 zope.schema = 4.4.2
-zope.security = 4.0.1
+zope.security = 4.0.3
 zope.securitypolicy = 4.0.0
 zope.sendmail = 4.0.1
-zope.session = 4.0.0
+zope.session = 4.1.0
 zope.site = 4.0.0
 zope.size = 4.1.0
 zope.structuredtext = 4.1.0
-zope.tal = 4.1.0
-zope.tales = 4.1.0
-zope.testing = 4.1.3
-zope.testrunner = 4.4.6
+zope.tal = 4.1.1
+zope.tales = 4.1.1
+zope.testing = 4.5.0
+zope.testrunner = 4.4.10
 zope.traversing = 4.0.0
 zope.viewlet = 4.0.0
 
 # Dependencies
-BTrees = 4.1.1
-Jinja2 = 2.7.3
+BTrees = 4.2.0
+Jinja2 = 2.8
 MarkupSafe = 0.23
 PasteDeploy = 1.5.2
-Pygments = 2.0.2
-Sphinx = 1.2.3
-WebOb = 1.4
-WebTest = 2.0.18
-ZConfig = 3.0.4
-coverage = 3.7.1
+Pygments = 2.1
+Sphinx = 1.3.5
+WebOb = 1.5.1
+WebTest = 2.0.20
+ZConfig = 3.1.0
+coverage = 4.0.3
 docutils = 0.12
 extras = 0.0.3
-nose = 1.3.4
+nose = 1.3.7
 ordereddict = 1.1
-persistent = 4.0.8
-py = 1.4.26
-python-gettext = 2.1
-python-mimeparse = 0.1.4
-python-subunit = 1.0.0
-pytz = 2014.10
-setuptools = 12.2
-six = 1.9.0
-testtools = 1.5.0
-transaction = 1.4.3
+persistent = 4.1.1
+py = 1.4.31
+python-gettext = 3.0
+python-mimeparse = 1.5.1
+python-subunit = 1.2.0
+pytz = 2015.7
+setuptools = 19.7
+six = 1.10.0
+testtools = 2.0.0
+transaction = 1.4.4
 z3c.recipe.sphinxdoc = 1.0.0
-zc.buildout = 2.3.1
+zc.buildout = 2.5.0
 zc.lockfile = 1.1.0
-zc.recipe.egg = 2.0.1
+zc.recipe.egg = 2.0.3
 zc.recipe.testrunner = 2.0.0
-zdaemon = 4.0.1
-zodbpickle = 0.5.2
+zdaemon = 4.1.0
+zodbpickle = 0.6.0
 
 # Dependencies for Python 2
 RestrictedPython = 3.6.0
@@ -108,7 +108,7 @@ Paste = 1.7.5.1
 # directly now.
 PasteScript = 1.7.5
 # XXX: Where is this needed?
-unittest2 = 0.8.0
+unittest2 = 1.1.0
 # Should just be ported.
 zc.resourcelibrary = 1.3.4
 zope.mkzeoinstance = 3.9.6
@@ -118,11 +118,11 @@ ZODB = 4.1.0
 ZEO = 4.1.0
 
 # toolchain
-argparse = 1.3.0
-lxml = 3.4.2
-mr.developer = 1.31
+argparse = 1.4.0
+lxml = 3.5.0
+mr.developer = 1.34
 repoze.sphinx.autointerface = 0.7.1
-collective.recipe.cmd = 0.9
+collective.recipe.cmd = 0.11
 # Missing py3 port
 z3c.checkversions = 0.5
 z3c.recipe.compattest = 1.0