Fix OSX travis build (they upgraded their default image).

JakobEngel · Dec 2, 2017 · 673e2e2 · 673e2e2
1 parent cc86b7b
commit 673e2e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,12 @@ matrix:
   - compiler: clang
     os: osx
     env: BUILD_TYPE=Release
+# For now only run on xcode8.3, which is the default image, since OSX testing on Travis can take a long time.
+#    osx_image: xcode8.3
+#  - compiler: clang
+#    os: osx
+#    env: BUILD_TYPE=Release
+#    osx_image: xcode7.3
 
 env:
   global:

diff --git a/scripts/ci-install-osx-deps.sh b/scripts/ci-install-osx-deps.sh
@@ -14,7 +14,8 @@ brew update
 
 # remove numpy, which is present in the travis image.
 # It will be installed from brew as opencv dependency, which fails if already present.
-/usr/bin/yes | pip uninstall numpy > /dev/null 2>&1
+PIP=`which pip` || PIP=pip2    # newer osx travis images don't have pip executable
+/usr/bin/yes | $PIP uninstall numpy > /dev/null  # 2>&1
 
 brew install eigen glew opencv libzip