diff --git a/.travis.yml b/.travis.yml index 8d86e61..cd40149 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ matrix: - ENV=mysql - OLDZODB=true - - python: pypy-5.4.1 + - python: pypy-5.6.0 env: ENV=mysql - python: 3.5 diff --git a/setup.py b/setup.py index 72d2240..d937af7 100644 --- a/setup.py +++ b/setup.py @@ -128,11 +128,12 @@ setup( 'ZODB >= 4.4.3', 'ZEO >= 4.3.1', ], - ":python_full_version == '3.6.0rc1'": [ + ":python_full_version == '3.6.0rc1' or python_full_version == '3.6.2rc1'": [ # For some reason ZEO isn't getting installed - # on 3.6rc1/pip 9.0.1/tox 2.5.1. Looks like the + # on 3.6rc1/pip 9.0.1/tox 2.5.1, or 3.6.2rc1. Looks like the # version selection <, >= environment markers aren't working. # So we give a full version spec, which seems to work. + # We see this on Travis especially. 'ZODB >= 4.4.3', 'ZEO >= 4.3.1', ],