CI: Add mac builds

 Conflicts:
	.travis.yml - Just the relevant and supported versions in the 2.x branch
                was kept. Official py3.4 support will come at the 3.x release

diff --git a/.ci/deploy.linux.sh b/.ci/deploy.linux.sh
new file mode 100644 (file)
index 0000000..4d59382
--- /dev/null
+++ b/.ci/deploy.linux.sh
@@ -0,0 +1,4 @@
+set -x
+set -e
+
+bash <(curl -s https://codecov.io/bash)

diff --git a/.ci/deploy.osx.sh b/.ci/deploy.osx.sh
new file mode 100644 (file)
index 0000000..c44550e
--- /dev/null
+++ b/.ci/deploy.osx.sh
@@ -0,0 +1,4 @@
+set -x
+set -e
+
+echo "Due to a bug in codecov, coverage cannot be deployed for Mac builds."

diff --git a/.ci/deps.linux.sh b/.ci/deps.linux.sh
new file mode 100644 (file)
index 0000000..13cc9e1
--- /dev/null
+++ b/.ci/deps.linux.sh
@@ -0,0 +1,4 @@
+set -x
+set -e
+
+echo "No dependencies to install for linux."

diff --git a/.ci/deps.osx.sh b/.ci/deps.osx.sh
new file mode 100644 (file)
index 0000000..b52a84f
--- /dev/null
+++ b/.ci/deps.osx.sh
@@ -0,0 +1,11 @@
+set -e
+set -x
+
+# Install packages with brew
+brew update >/dev/null
+brew outdated pyenv || brew upgrade --quiet pyenv
+
+# Install required python version for this build
+pyenv install -ks $PYTHON_VERSION
+pyenv global $PYTHON_VERSION
+python --version

diff --git a/.travis.yml b/.travis.yml
index 583a128df6483d1ce867dc816a807c7fd3520620..cbb61b131ff07420717f4af5229b1bc8a4cc5013 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,46 @@
 language: python
 
-python:
-  - "2.6"
-  - "2.7"
-  - "pypy"
-  - "3.3"
+sudo: false
+
+cache: false
+
+matrix:
+  include:
+    - os: linux
+      python: 2.6
+    - os: linux
+      python: 2.7
+    - os: linux
+      python: pypy
+    - os: linux
+      python: 3.3
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=2.6.6
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=2.7.10
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=pypy-2.6.0
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=3.3.6
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
 
 install:
+  - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
   - pip install pytest pytest-cov
   - pip install --editable .
@@ -16,7 +50,7 @@ sudo: false
 
 script:
   - make test-cov
-  - bash <(curl -s https://codecov.io/bash)
+  - bash .ci/deploy.${TRAVIS_OS_NAME}.sh
 
 notifications:
   email: false