Cleanup and update some versions.

buildout.cfg

@@ -3,8 +3,7 @@ extends =
    grok.cfg
 parts =
   checkversions
-#  depgraph
-#  omelette
+  omelette
   test-grok
   uploadversions
 develop = .
@@ -13,6 +12,7 @@ allow-picked-versions = false
 include-site-packages = false
 auto-checkout =
   grok
+  grokcore.json
   grokcore.chameleon
   grokcore.rest
   grokcore.xmlrpc
@@ -28,14 +28,6 @@ auto-checkout =
 recipe = zc.recipe.egg
 eggs = z3c.checkversions [buildout]
 
-[depgraph]
-recipe = z3c.recipe.depgraph
-eggs = ${grok:packages}
-extras = True
-variants =
-  base
-  scc
-
 [omelette]
 recipe = collective.recipe.omelette
 eggs = ${grok:packages}

grok.cfg

@@ -36,7 +36,7 @@ packages =
    zope.fanstatic
 
 [versions]
-Chameleon = 2.24
+Chameleon = 3.2
 fanstatic = 1.0a7
 grok = 1.14.1
 grokcore.annotation = 1.6.0
@@ -81,37 +81,28 @@ zope.lifecycleevent = 4.2.0
 zope.testbrowser = 5.0
 # Tools and dependencies
 appnope = 0.1.0
-beautifulsoup4 = 4.4.1
-collective.recipe.omelette = 0.16
-collective.recipe.template = 1.13
-colorama = 0.3.6
-decorator = 4.0.6
-gnureadline = 6.3.3
+beautifulsoup4 = 4.6.0
+collective.recipe.omelette = 0.15
+collective.recipe.template = 2.0
+decorator = 4.1.2
+gnureadline = 6.3.8
 ipython-genutils = 0.1.0
-mechanize = 0.2.5
-ordereddict = 1.1
 Paste = 2.0.3
-path.py = 8.1.2
-pexpect = 4.0.1
-pickleshare = 0.5
-pkginfo = 1.2.1
-ptyprocess = 0.5
-requests = 2.9.1
-requests-toolbelt = 0.5.1
+pexpect = 4.3.1
+pickleshare = 0.7.4
+pkginfo = 1.4.1
+ptyprocess = 0.5.2
+requests-toolbelt = 0.8.0
 shutilwhich = 1.1.0
 simplegeneric = 0.8.1
-simplejson = 3.8.2
-traitlets = 4.0.0
-twine = 1.6.5
-waitress = 0.8.10
+traitlets = 4.3.2
+tqdm = 4.19.5
+twine = 1.9.1
+waitress = 1.1.0
 WebOb = 1.7.4
 WebTest = 2.0.29
-zc.catalog = 2.0.1
-zc.recipe.testrunner = 2.0
-zest.releaser = 6.5
-zopyx.txng3.ext = 4.0.0
-# Found during python 3 porting
-WSGIProxy2 = 0.4.2
+zest.releaser = 6.13.3
+WSGIProxy2 = 0.4.4
 
 [sources]
 # While working on the python 3 branches, make use of this sources list.
@@ -122,7 +113,7 @@ grokcore.chameleon = git ${buildout:github}/grokcore.chameleon pushurl=${buildou
 grokcore.component = git ${buildout:github}/grokcore.component pushurl=${buildout:github_push}/grokcore.component
 grokcore.content = git ${buildout:github}/grokcore.content pushurl=${buildout:github_push}/grokcore.content
 grokcore.formlib = git ${buildout:github}/grokcore.formlib pushurl=${buildout:github_push}/grokcore.formlib
-grokcore.json = git ${buildout:github}/grokcore.json pushurl=${buildout:github_push}/grokcore.json
+grokcore.json = git ${buildout:github}/grokcore.json pushurl=${buildout:github_push}/grokcore.json branch=resurrection-python3
 grokcore.layout = git ${buildout:github}/grokcore.layout pushurl=${buildout:github_push}/grokcore.layout
 grokcore.message = git ${buildout:github}/grokcore.message pushurl=${buildout:github_push}/grokcore.message
 grokcore.rest = git ${buildout:github}/grokcore.rest pushurl=${buildout:github_push}/grokcore.rest branch=resurrection-python3