Merge remote-tracking branch 'yan12125/test' into ha-feature-osx-builds-cleanup

Author: BanzaiMan

.travis.yml

@@ -1,4 +1,4 @@
-language: python
+language: c
 
 matrix:
   include:
@@ -8,32 +8,31 @@ matrix:
       env:
         - RELEASE=trusty
     - sudo: required
-      env:
-        - RELEASE=precise
+      env: RELEASE=precise
     - os: osx
       osx_image: xcode8.2
-      env:
-        - RELEASE=sierra
+      env: RELEASE=sierra
     - os: osx
       osx_image: xcode7.3
-      env:
-        - RELEASE=sierra
-    - os: osx
-      osx_image: xcode6.4
-      env:
-        - RELEASE=yosemite
+      env: RELEASE=elcapitan
 
 env:
   global:
     - VERSION='3.6-dev'
     - ALIAS='nightly'
 
 install:
-- pushd /opt/pyenv/
-- sudo git checkout master
-- sudo git pull
-- popd
-- python -m pip install virtualenv
+- |
+  if [[ "$(uname)" == "Linux" ]] ; then
+    pushd /opt/pyenv/
+    sudo git checkout master
+    sudo git pull
+    popd
+  else
+    brew uninstall pyenv
+    brew install pyenv --HEAD
+  fi
+- sudo -H python -m pip install virtualenv --upgrade
 
 before_script:
 - 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'

bin/compile

@@ -21,8 +21,14 @@ function install_numpy() {
 
 set -o xtrace
 
-sudo env PYTHON_BUILD_ROOT=/opt/pyenv/plugins/python-build \
-  /opt/pyenv/plugins/python-build/bin/python-build $VERSION $INSTALL_DEST/$VERSION
+if [[ "$(uname)" == "Linux" ]] ; then
+  PYENV_ROOT=/opt/pyenv
+else
+  PYENV_ROOT=/usr/local/opt/pyenv
+fi
+
+sudo env PYTHON_BUILD_ROOT=$PYENV_ROOT/plugins/python-build \
+  $PYENV_ROOT/plugins/python-build/bin/python-build $VERSION $INSTALL_DEST/$VERSION
 
 if [[ $ALIAS ]] ; then
   rm -f $INSTALL_DEST/$ALIAS