Merge branch '2.13' into plone-hotfix20171128-format-213

zopefoundation · Dec 1, 2017 · d869628 · d869628
2 parents b5aaf63 + 86352dd
commit d869628
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.so
 .installed.cfg
 .Python
+.tox/
 bin
 build
 develop-eggs

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -9,6 +9,8 @@ Changelog
 
 - set explicit PyPI index, the old ``zc.buildout`` defaults no longer work
 
+- add ``tox`` testing configuration
+
 2.13.15 (2017-02-15)
 --------------------
 

diff --git a/buildout.cfg b/buildout.cfg
@@ -7,7 +7,9 @@ parts = interpreter test
 [interpreter]
 recipe = zc.recipe.egg
 interpreter = python
-eggs = AccessControl
+eggs =
+    AccessControl
+    tox
 
 [test]
 recipe = zc.recipe.testrunner

diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,13 @@
+[tox]
+envlist =
+    py26,py27
+
+[testenv]
+commands =
+    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
+    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
+    {envbindir}/test -v1
+skip_install = true
+deps =
+    setuptools==33.1.1
+    zc.buildout==2.3.1