try pyenv

samantehrani · Sep 25, 2016 · 5a47a70 · 5a47a70
1 parent 5cb65df
commit 5a47a70
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,17 @@ matrix:
       # see: https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
       osx_image: xcode7.1
       python: 2.7
-      env: TOXENV=py27-alldeps-withcov-posix,codecov-publish
+      env: TOXENV=py27-alldeps-withcov-macos1010,codecov-publish
+    #
+    # OSX 10.11
+    #
+    - language: generic
+      os: osx
+      # 8 is OS X 10.11.x
+      # see: https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
+      osx_image: xcode8
+      env: TOXENV=py35-alldeps-withcov-macos,codecov-publish
+
 
   allow_failures:
     # For now, OSX run on Travis-CI has a few failures.
@@ -75,6 +85,7 @@ addons:
 cache:
   directories:
     - $HOME/.cache/pip
+    - $HOME/.pyenv
 
 
 install:

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -8,6 +8,15 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     python -m pip install --user virtualenv
     python -m virtualenv ~/.venv
     source ~/.venv/bin/activate
+
+    if [[ "${TOXENV}" == "py35-alldeps-withcov-macos,codecov-publish" ]]; then
+
+        brew upgrade;
+        brew install pyenv;
+        pyenv install -s 3.5.2;
+        pyenv global system 3.5.2;
+
+    elif
 fi
 
 # Temporary workaround for https://github.com/pypa/setuptools/issues/776;

diff --git a/tox.ini b/tox.ini
@@ -61,9 +61,9 @@ deps =
     {alldeps,tests}-macos: pyobjc-core
     {alldeps,tests}-macos: pyobjc-framework-cfnetwork
 
-    {alldeps,tests}-macos1010: pyobjc-core==3.1.1
-    {alldeps,tests}-macos1010: pyobjc-framework-cfnetwork==3.1.1
-    {alldeps,tests}-macos1010: pyobjc-framework-Cocoa==3.1.1
+    {alldeps,tests}-macos1010: pyobjc-core==3.0.4
+    {alldeps,tests}-macos1010: pyobjc-framework-cfnetwork==3.0.4
+    {alldeps,tests}-macos1010: pyobjc-framework-Cocoa==3.0.4
 
     {withcov,coverage}: coverage