Attempt to fix Python 3.6 build on Travis.
This commit is contained in:
parent
db12477bc3
commit
d584d19ef0
|
@ -34,7 +34,7 @@ matrix:
|
||||||
- ENV=mysql
|
- ENV=mysql
|
||||||
- OLDZODB=true
|
- OLDZODB=true
|
||||||
|
|
||||||
- python: pypy-5.4.1
|
- python: pypy-5.6.0
|
||||||
env: ENV=mysql
|
env: ENV=mysql
|
||||||
|
|
||||||
- python: 3.5
|
- python: 3.5
|
||||||
|
|
5
setup.py
5
setup.py
|
@ -128,11 +128,12 @@ setup(
|
||||||
'ZODB >= 4.4.3',
|
'ZODB >= 4.4.3',
|
||||||
'ZEO >= 4.3.1',
|
'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
|
# 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.
|
# version selection <, >= environment markers aren't working.
|
||||||
# So we give a full version spec, which seems to work.
|
# So we give a full version spec, which seems to work.
|
||||||
|
# We see this on Travis especially.
|
||||||
'ZODB >= 4.4.3',
|
'ZODB >= 4.4.3',
|
||||||
'ZEO >= 4.3.1',
|
'ZEO >= 4.3.1',
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue