Update .travis.yml

Author: searchivarius

.travis.yml

@@ -21,27 +21,38 @@ addons:
 
 before_install:
 - |
+  PIP=pip
+  PY=python
   if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.9 CC=gcc-4.9; fi
-  if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "${PYTHON:0:1}" = "3" ]; then
-      brew update
-      brew install python3
-      command curl -sSL https://rvm.io/mpapis.asc | gpg --import -;
-      rvm get stable
+  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    brew update
+    brew install gcc
+    PIP=pip2
+    PY=python2
+    if  [ "${PYTHON:0:1}" = "3" ]; then
+      brew upgrade python
+      brew install sashkab/python/python$PYTHON
+      PIP=pip3
+      PY=python3
+    fi
   fi
-  pip install --user --upgrade pip virtualenv
-  virtualenv -p python venv
+  $PIP install --user virtualenv
+  virtualenv -p $PY venv
   source venv/bin/activate
+  $PIP install --upgrade pip
 
 install:
 - |
-  travis_wait travis_retry pip install -r python_bindings/requirements.txt
-  travis_retry cd python_bindings && python setup.py build install && cd ..
+  travis_wait travis_retry $PIP install -r python_bindings/requirements.txt
+  travis_retry cd python_bindings && $PY setup.py build install && cd ..
 
 script:
+- $PY --version
+- $PIP --version
 - |
   set -e
   cd python_bindings
-  python setup.py test
+  $PY setup.py test
   cd ..
 
 cache: