Merge pull request #304 from plone/zc-buildout-280-51

Use zc.buildout 2.8.0 and setuptools 34.2.0.
plone · Feb 16, 2017 · 773dcf0 · 773dcf0
2 parents 95d4a57 + 4dc58be
commit 773dcf0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,6 @@
-setuptools==33.1.1
-zc.buildout==2.5.3
+appdirs==1.4.0
+packaging==16.8
+pyparsing==2.1.10
+setuptools==34.2.0
+six==1.10.0
+zc.buildout==2.8.0
diff --git a/tests.cfg b/tests.cfg
@@ -426,7 +426,7 @@ exclude =
     Acquisition
     AuthEncoding
     argh
-    argparse
+    appdirs
     argparse
     Babel
     beautifulsoup4
@@ -503,6 +503,7 @@ exclude =
     Products.ZSQLMethods
     PyGithub
     Pygments
+    pyparsing
     python-dateutil
     python-gettext
     python-openid

diff --git a/versions.cfg b/versions.cfg
@@ -47,8 +47,12 @@ ZServer = 3.0
 
 # Basics
 # !! keep in sync with requirements.txt !!
-setuptools = 33.1.1
-zc.buildout = 2.5.3
+appdirs = 1.4.0
+packaging = 16.8
+pyparsing = 2.1.10
+setuptools = 34.2.0
+six = 1.10.0
+zc.buildout = 2.8.0
 
 # recipes and extensions
 collective.recipe.omelette = 0.16
@@ -120,7 +124,6 @@ pytz = 2016.10
 repoze.xmliter = 0.6
 requests = 2.12.5
 simplejson = 3.10.0
-six = 1.10.0
 slimit = 0.8.1
 WebOb = 1.6.3
 future = 0.16.0