Fix travis (#629)

* use python -m to ensure correct interpreter

Signed-off-by: William Woodall <william@osrfoundation.org>

* remove special cases for homebrew

Signed-off-by: William Woodall <william@osrfoundation.org>

* also python -m for codecov

Signed-off-by: William Woodall <william@osrfoundation.org>

.travis.yml

@@ -23,13 +23,13 @@ matrix:
 install:
   - source .travis/install.sh
   - python --version
-  - pip install PyYAML argparse rospkg vcstools catkin_pkg python-dateutil rosdistro
-  - pip install -e .
-  - pip install nose coverage flake8 mock codecov
+  - python -m pip install PyYAML argparse rospkg vcstools catkin_pkg python-dateutil rosdistro
+  - python -m pip install -e .
+  - python -m pip install nose coverage flake8 mock codecov
 # command to run tests
 script:
-  - nosetests --with-coverage --cover-package=rosdep2 --with-xunit test
+  - python -m nose --with-coverage --cover-package=rosdep2 --with-xunit test
 after_script:
-  - codecov
+  - python -m codecov
 notifications:
   email: false

.travis/install.sh

@@ -12,17 +12,6 @@ do_install()
         PYTHON_ENV_NAME=virtual-env-$TRAVIS_PYTHON_VERSION
         pyenv virtualenv $TRAVIS_PYTHON_VERSION $PYTHON_ENV_NAME
         pyenv activate $PYTHON_ENV_NAME
-
-    elif [[ $TRAVIS_OS_NAME == 'osx' && $PYTHON_INSTALLER == 'brew' ]]; then
-        # nose 1.3.7 creates /usr/local/man dir if it does not exist.
-        # The operation fails because current user does not own /usr/local.  Create the dir manually instead.
-        sudo mkdir /usr/local/man
-        sudo chown -R $(whoami) $(brew --prefix)/*
-
-        export PATH=$(pwd)/.travis/shim:$PATH
-
-        mkdir -p ~/Library/Python/2.7/lib/python/site-packages
-        echo "$(brew --prefix)/lib/python2.7/site-packages" >> ~/Library/Python/2.7/lib/python/site-packages/homebrew.pth
     fi
 }