Skip to content

Commit

Permalink
More faffing with PATH
Browse files Browse the repository at this point in the history
  • Loading branch information
manics committed Oct 13, 2020
1 parent 6176e60 commit bc91592
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 32 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ before_install:
# see https://github.com/travis-ci/travis-ci/issues/8048
# Changing the value for sudo will also need to be reviewed at the same time
# This will need to be reviewed when the issue above is fixed
- if [ "${TRAVIS_PYTHON_VERSION:-}" = "2.7" ]; then export PATH=/usr/bin/:$PATH; fi
- ./travis-install
- pip install 'flake8<3.8' tox
- flake8 -v .
Expand Down
34 changes: 3 additions & 31 deletions travis-install
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,9 @@ sudo ln -s /opt/ice-3.6.5-0.3.0/bin/* /usr/local/bin/
# The distribution Python 2.7 is still present when Travis is setup to use 3.6
# so we can use it to run OMERO

# First figure out which executables exist
set +e
echo $PATH

python --version
python2 --version
python2.7 --version
python3 --version
python3.6 --version

python3 -mpip --version
python3.6 -mpip --version

pip --version
pip2 --version
pip2.7 --version
pip3 --version
pip3.6 --version

which python
which python2
which python2.7
which python3
which python3.6

which pip
which pip2
which pip2.7
which pip3
which pip3.6
set -e
if [ "${TRAVIS_PYTHON_VERSION:-}" = "2.7" ]; then
export PATH=/usr/bin/:$PATH
fi

if [ "$TRAVIS_PYTHON_VERSION" = "3.6" ]; then
pip install https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.3.0/zeroc_ice-3.6.5-cp36-cp36m-manylinux2014_x86_64.whl
Expand Down

0 comments on commit bc91592

Please sign in to comment.