Merge branch 'master' into extract-cmfplone-dep

plone · Sep 11, 2018 · 3ad2d02 · 3ad2d02
2 parents 2a5f310 + 4b14683
commit 3ad2d02
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,8 @@ all: .installed.cfg
 	bin/buildout
 
 bin/buildout: bin/pip
-	bin/pip install --upgrade pip setuptools zc.buildout
+	bin/pip install --upgrade pip
+	bin/pip install -r requirements.txt
 	@touch -c $@
 
 bin/python bin/pip:

diff --git a/plone-4.3.x.cfg b/plone-4.3.x.cfg
@@ -1,5 +1,5 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/4.3.15/versions.cfg
+    http://dist.plone.org/release/4.3.18/versions.cfg
     versions.cfg
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 # https://github.com/plone/buildout.coredev/blob/5.1/requirements.txt
-setuptools==38.5.1
-zc.buildout==2.11.4
+setuptools==39.1.0
+zc.buildout==2.11.5
diff --git a/versions.cfg b/versions.cfg
@@ -1,10 +1,13 @@
 [versions]
+# setuptools / buildout
 setuptools =
 zc.buildout =
-zc.recipe.egg =
+zc.recipe.egg = 2.0.3
+
 six = 1.10.0
 httpie = 0.9.4
-# https://github.com/plone/plone.recipe.zope2instance/issues/37
+
+# Fix https://github.com/plone/plone.recipe.zope2instance/issues/37
 plone.recipe.zope2instance = 4.4.0
 
 # Release