Merge 7f9b2f3 into 5da1596

zopefoundation · Oct 29, 2020 · 057c80a · 057c80a
2 parents 5da1596 + 7f9b2f3
commit 057c80a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 223 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,11 +16,11 @@ matrix:
           env: TOXENV=py38
 
 install:
-    - travis_retry pip install -U pip setuptools
-    - travis_retry pip install -U tox coveralls coverage
+    - pip install -U pip setuptools
+    - pip install -U tox coveralls coverage
 
 script:
-    - travis_retry tox
+    - tox
 
 after_success:
     - coverage combine

diff --git a/bootstrap.py b/bootstrap.py
diff --git a/buildout.cfg b/buildout.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg
+    http://zopefoundation.github.io/Zope/releases/master/versions.cfg
 develop = .
 parts =
     test

diff --git a/buildout4.cfg b/buildout4.cfg
@@ -0,0 +1,5 @@
+[buildout]
+extends =
+    buildout.cfg
+    http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg
+
diff --git a/tox.ini b/tox.ini
@@ -1,17 +1,18 @@
 [tox]
 envlist =
-   py27,
-   py35,
-   py36,
-   py37,
-   py38,
-   lint,
-   coverage,
+   py27
+   py35
+   py36
+   py37
+   py38
+   lint
+   coverage
 
 [testenv]
+commands_pre =
+    py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
+    !py27-!py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-    {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
     coverage run {envbindir}/test
 skip_install = true
 deps =