From bc915929753f06d54695ab1de3041f5dbce28483 Mon Sep 17 00:00:00 2001
From: Simon Li <spli@dundee.ac.uk>
Date: Tue, 13 Oct 2020 15:23:26 +0100
Subject: [PATCH] More faffing with PATH

---
 .travis.yml    |  1 -
 travis-install | 34 +++-------------------------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5957849..ee87639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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 .
diff --git a/travis-install b/travis-install
index af83509..e1d00c3 100755
--- a/travis-install
+++ b/travis-install
@@ -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