- don't use buildout, just tox

.github/workflows/tests.yml

@@ -16,6 +16,7 @@ jobs:
         - ["2.7",   "py27"]
         - ["2.7",   "py27-msgpack1"]
         - ["2.7",   "py27-zeo4"]
+        - ["2.7",   "zodbmaster"]
         - ["3.5",   "py35"]
         - ["3.5",   "py35-zeo4"]
         - ["3.6",   "py36"]
@@ -25,7 +26,7 @@ jobs:
         - ["3.7",   "py37-mtacceptor"]
         - ["3.7",   "py37-mtacceptor-msgpack1"]
         - ["3.7",   "py37-uvloop"]
-        - ["3.7",   "py37-zodb-master"]
+        - ["3.7",   "py37-zodbmaster"]
         - ["pypy2", "pypy"]
         - ["pypy3", "pypy3"]
         - ["pypy3", "pypy3-mtacceptor"]

.gitignore

@@ -3,10 +3,8 @@
 __pycache__
 *.egg-info
 .installed.cfg
-.mr.developer.cfg
 .tox
 bin
-develop
 develop-eggs
 dist
 eggs

tox.ini

@@ -16,7 +16,8 @@ commands =
 # Only run functional tests if unit tests pass.
     zope-testrunner -f --test-path=src {posargs:-vc}
 deps =
-    ZODB >= 4.2.0b1
+    !zodbmaster: ZODB >= 4.2.0b1
+    zodbmaster: -e git+https://github.com/zopefoundation/ZODB.git@master#egg=ZODB
     random2
     ZConfig
     manuel
@@ -59,19 +60,6 @@ deps =
     {[testenv]deps}
     uvloop
 
-[testenv:py37-zodb-master]
-deps =
-    setuptools < 52
-    zc.buildout
-    zope.testrunner
-    zope.testing
-    mock
-    random2
-    msgpack < 1
-commands =
-    {envbindir}/buildout -c {toxinidir}/zodb-master.cfg buildout:directory={envdir} buildout:develop={toxinidir}
-    {envbindir}/test {posargs}
-
 [testenv:simple]
 # Test that 'setup.py test' works
 basepython =

zodb-master.cfg

-# This buildout configuration creates test scripts and interpreters that
-# pull in the ZODB master branch instead of the latest release.
-[buildout]
-extends =
-    buildout.cfg
-    https://raw.githubusercontent.com/zopefoundation/Zope/master/sources.cfg
-extensions = mr.developer
-sources-dir = develop
-auto-checkout =
-    ZODB
-
-[versions]
-ZODB =
-
-[test]
-eggs =
-    ZEO
-# ZopeUndo is needed as soft-dependency for a regression test
-    ZopeUndo
-defaults = ['-cv', '-s', 'ZEO', '--all']