more work trying to get an OSX builder to run

None of this will work unless the osx build feature is enabled on travis.
rackerlabs · Dec 31, 2014 · 9026766 · 9026766
1 parent ee81996
commit 9026766
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,19 +4,19 @@ os:
   - linux
 
 env:
-  - TOX_ENV=lint
-  - TOX_ENV=py26
-  - TOX_ENV=py27
-  - TOX_ENV=pypy
-  - TOX_ENV=docs
-  - TOX_ENV=docs-spellcheck
-  - TOX_ENV=docs-linkcheck
-  - TOX_ENV=bundle
+  matrix:
+    - TOX_ENV=lint
+    - TOX_ENV=py26
+    - TOX_ENV=py27
+    - TOX_ENV=pypy
+    - TOX_ENV=docs
+    - TOX_ENV=docs-spellcheck
+    - TOX_ENV=docs-linkcheck
+    - TOX_ENV=bundle
 
 matrix:
   allow_failures:
     - env: "TOX_ENV=docs-linkcheck"
-
   exclude:
     - os: osx
       env: lint

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -6,6 +6,7 @@
 set -e
 set -x
 
+
 if [[ "${TOX_ENV}" == "pypy"* ]]; then
     sudo add-apt-repository -y ppa:pypy/ppa
     sudo apt-get -y update
@@ -16,6 +17,12 @@ if [[ "${TOX_ENV}" == "pypy"* ]]; then
     sudo rm -rf /usr/local/pypy/bin
 fi
 
+if [[ "$(uname -s)" == 'Darwin' ]]; then
+    DARWIN=true
+else
+    DARWIN=false
+fi
+
 if [[ "${TOX_ENV}" == "docs-spellcheck" ]]; then
     if [[ "$DARWIN" = true ]]; then
         brew update
@@ -32,7 +39,8 @@ if [[ "${TOX_ENV}" == "bundle" ]]; then
         brew install python pyenv
 
         # a non-system python must be used for py2app.
-        pyenv local 2.7.9
+        pyenv global 2.7.9
+	pyenv rehash
     fi
 fi