Skip to content

Commit

Permalink
tox: default to not using-manylinux ice wheel
Browse files Browse the repository at this point in the history
  • Loading branch information
manics committed Sep 17, 2020
1 parent d25fdb8 commit a769ab7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist/
*.egg-info/
*.pyc
*.pyc
.tox/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ script:
- python setup.py sdist
- pip install dist/omero-web*gz
- python -c "import omeroweb.version as owv; print(owv.omeroweb_version)"
- tox
- tox -e travis

deploy:
provider: pypi
Expand Down
12 changes: 8 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[tox]
# Default tox environment when run without `-e`
envlist = py36
# Use `-e travis` to speed up travis by installing a pre-built ice wheel

# https://tox.readthedocs.io/en/latest/config.html#conf-requires
# Ensure pip is new so we can install manylinux wheel
requires = pip >= 19.0.0
Expand All @@ -12,12 +15,13 @@ deps =
numpy>=1.9
pytest
PyYAML
py27: tables < 3.6.0
py36: tables
tables
# https://github.com/pytest-dev/pytest-xdist/issues/585
pytest-xdist < 2
restructuredtext-lint
py36: https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.1.0/zeroc_ice-3.6.5-cp36-cp36m-manylinux2010_x86_64.whl
zeroc-ice >3.6,<3.7
travis: https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.1.0/zeroc_ice-3.6.5-cp36-cp36m-manylinux2010_x86_64.whl


setenv =
OMERODIR = {toxinidir}
Expand All @@ -32,5 +36,5 @@ commands =
pip install .
pytest {posargs:-rf}

[testenv:py36]
[testenv:travis]
basepython = python3.6

0 comments on commit a769ab7

Please sign in to comment.