Run tox in travis instead of Dockerfile

ome · Sep 16, 2020 · 0ed6ac7 · 0ed6ac7
1 parent 26d08d0
commit 0ed6ac7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ services:
   - docker
 
 before_install:
-  - pip install -U pip
+  - pip install -U pip tox
   - pip install https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.2.0/zeroc_ice-3.6.5-cp36-cp36m-manylinux2010_x86_64.whl
   # https://github.com/ome/openmicroscopy/blob/v5.5.1/Dockerfile#L32
   - python -c "import Ice; print(Ice.stringVersion())"
@@ -19,8 +19,7 @@ script:
   - python setup.py sdist
   - pip install dist/omero-web*gz
   - python -c "import omeroweb.version as owv; print(owv.omeroweb_version)"
-  - docker build -t test .
-  - docker run --rm -ti test
+  - tox
 
 deploy:
   provider: pypi

diff --git a/Dockerfile b/Dockerfile
diff --git a/tox.ini b/tox.ini
@@ -17,7 +17,6 @@ deps =
     # https://github.com/pytest-dev/pytest-xdist/issues/585
     pytest-xdist < 2
     restructuredtext-lint
-    py27: https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.1.0/zeroc_ice-3.6.5-cp27-cp27mu-manylinux2010_x86_64.whl
     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
 
 setenv =
@@ -34,5 +33,4 @@ commands =
     pytest {posargs:-rf}
 
 [testenv:py36]
-basepython =
-    /opt/rh/rh-python36/root/usr/bin/python3.6
+basepython = python3.6