Sync w/ ZTK trunk.

versions.cfg

@@ -33,32 +33,6 @@ Products.SiteErrorLog = 2.13.2
 Products.StandardCacheManagers = 2.13.1
 
 # ZTK KGS overrides
-BTrees = 4.0.8
-coverage = 3.7.1
-docutils = 0.12
-Jinja2 = 2.7.3
-lxml = 3.4
-MarkupSafe = 0.23
-mr.developer = 1.31
-nose = 1.3.4
-persistent = 4.0.8
-py = 1.4.26
-pytz = 2014.7
-setuptools = 7.0
-six = 1.4.1
-Sphinx = 1.2.3
-transaction = 1.4.3
-unittest2 = 0.7.1
-WebOb = 1.4
-WebTest = 2.0.16
-z3c.checkversions = 0.5
-ZConfig = 3.0.4
-zc.buildout = 2.2.4
-ZODB = 4.0.1
-zope.principalregistry = 4.0.0a2
-zope.publisher = 4.0.0a4
-zope.schema = 4.4.2
-zope.traversing = 4.0.0
 
 # Zope2 dependencies
 collective.recipe.sphinxbuilder = 0.8.2

ztk-versions.cfg

@@ -6,7 +6,7 @@ zope.authentication = 4.1.0
 zope.browser = 2.0.2
 zope.browsermenu = 4.1.0a1
 zope.browserpage = 4.1.0a1
-zope.browserresource = 4.0.1
+zope.browserresource = 4.0.2
 zope.cachedescriptors = 4.0.0
 zope.catalog = 4.0.0a1
 zope.component = 4.2.1
@@ -43,13 +43,13 @@ zope.pagetemplate = 4.0.4
 zope.password = 4.0.2
 zope.pluggableauth = 2.0.0a1
 zope.principalannotation = 4.0.0a2
-zope.principalregistry = 4.0.0a1
+zope.principalregistry = 4.0.0a2
 zope.processlifetime = 2.0
 zope.proxy = 4.1.4
 zope.ptresource = 4.0.0a1
 zope.publisher = 4.0.0
 zope.ramcache = 2.0.0
-zope.schema = 4.4.1
+zope.schema = 4.4.2
 zope.security = 4.0.1
 zope.securitypolicy = 4.0.0a1
 zope.sendmail = 4.0.0
@@ -61,40 +61,41 @@ zope.tal = 4.0.0
 zope.tales = 4.0.2
 zope.testing = 4.1.3
 zope.testrunner = 4.4.3
-zope.traversing = 4.0.0a2
+zope.traversing = 4.0.0
 zope.viewlet = 4.0.0a1
 
 # Dependencies
-BTrees = 4.0.7
-Jinja2 = 2.6
+BTrees = 4.0.8
+Jinja2 = 2.7.3
+MarkupSafe = 0.23
 PasteDeploy = 1.5.2
 Pygments = 1.6
-Sphinx = 1.1.3
-WebOb = 1.2.3
-WebTest = 2.0.5
-ZConfig = 3.0.3
-coverage = 3.6
-docutils = 0.10
+Sphinx = 1.2.3
+WebOb = 1.4
+WebTest = 2.0.17
+ZConfig = 3.0.4
+coverage = 3.7.1
+docutils = 0.12
 extras = 0.0.3
-nose = 1.3.0
+nose = 1.3.4
 ordereddict = 1.1
-persistent = 4.0.6
-py = 1.4.20
+persistent = 4.0.8
+py = 1.4.26
 python-gettext = 2.1
 python-mimeparse = 0.1.4
-python-subunit = 0.0.16
-pytz = 2013b
+python-subunit = 0.0.21
+pytz = 2014.7
 setuptools = 8.2.1
-six = 1.3.0
-testtools = 0.9.34
-transaction = 1.4.1
+six = 1.4.1
+testtools = 0.9.39
+transaction = 1.4.3
 z3c.recipe.sphinxdoc = 1.0.0
-zc.buildout = 2.2.4
+zc.buildout = 2.3.1
 zc.lockfile = 1.1.0
 zc.recipe.egg = 2.0.1
 zc.recipe.testrunner = 2.0.0
 zdaemon = 4.0.0
-zodbpickle = 0.4.1
+zodbpickle = 0.4.4
 
 # Dependencies for Python 2
 RestrictedPython = 3.6.0
@@ -107,20 +108,20 @@ Paste = 1.7.5.1
 # directly now.
 PasteScript = 1.7.5
 # XXX: Where is this needed?
-unittest2 = 0.5.1
+unittest2 = 0.7.1
 # Should just be ported.
 zc.resourcelibrary = 1.3.4
-zope.mkzeoinstance = 3.9.5
+zope.mkzeoinstance = 3.9.6
 # Needs merge of py3 branch.
-ZODB = 4.0.0
+ZODB = 4.0.1
 # Do we really need ZEO?
 ZEO = 4.0.0
 
 # toolchain
-argparse = 1.2.1
-lxml = 3.2
-mr.developer = 1.25
+argparse = 1.2.2
+lxml = 3.4.1
+mr.developer = 1.31
 repoze.sphinx.autointerface = 0.7.1
 # Missing py3 port
-z3c.checkversions = 0.4.2
+z3c.checkversions = 0.5
 z3c.recipe.compattest = 1.0