Skip to content

Commit

Permalink
Remove OSX from our build matrix
Browse files Browse the repository at this point in the history
The Travis OSX builders are incredibly inconsistent for how long
they take to run our test suite. It is currently ranging anywhere
from ~15 minutes to well beyond 50 minutes, at which point it
times out.
  • Loading branch information
dstufft committed May 8, 2014
1 parent 9f56b79 commit 7e73304
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 106 deletions.
24 changes: 1 addition & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
language: c

os:
- osx
- linux
language: python

env:
- TOXENV=pep8
Expand Down Expand Up @@ -32,21 +28,3 @@ notifications:
- "irc.freenode.org#pypa-dev"
use_notice: true
skip_join: true

# When building an exclude matrix on Travis you must supply the exact variable
# combinations you want to exclude from your build matrix. There is no
# (current) way to make this less verbose.
matrix:
exclude:
- os: osx
env: TOXENV=pep8
- os: osx
env: TOXENV=py3pep8
- os: osx
env: TOXENV=docs
# We exclude these because they take so long, theortically an issue could
# show up only on 3.2 or PyPy on OSX. However (hopefully) that is unlikely.
- os: osx
env: TOXENV=py32
- os: osx
env: TOXENV=pypy
80 changes: 0 additions & 80 deletions .travis/install.sh
Original file line number Diff line number Diff line change
@@ -1,89 +1,9 @@
#!/bin/bash

set -e
set -x

if [[ "$(uname -s)" == "Darwin" ]]; then
brew update
brew install bazaar
brew install pyenv

if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi

# Adapted from Ubuntu 14.04
PYTHON_CONFIGURE_OPTS="--enable-unicode=ucs4 --with-wide-unicode --enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions --with-computed-gotos"
PYTHON_CFLAGS="-g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security"

case $TOXENV in
py26)
pyenv install 2.6.9
pyenv global 2.6.9
;;
py27)
pyenv install 2.7.6
pyenv global 2.7.6
;;
pypy)
pyenv install pypy-2.2.1
pyenv global pypy-2.2.1
;;
py32)
pyenv install 3.2.5
pyenv global 3.2.5
;;
py33)
pyenv install 3.3.5
pyenv global 3.3.5
;;
py34)
pyenv install 3.4.0
pyenv global 3.4.0
;;
esac

pip install virtualenv

pyenv rehash
else
# add mega-python ppa
sudo add-apt-repository -y ppa:fkrull/deadsnakes
sudo apt-get -y update

case $TOXENV in
py26)
sudo apt-get install python2.6
;;
py32)
sudo apt-get install python3.2
;;
py33)
sudo apt-get install python3.3
;;
py34)
sudo apt-get install python3.4
;;
py3pep8)
sudo apt-get install python3.3
;;
pypy)
sudo add-apt-repository -y ppa:pypy/ppa
sudo apt-get -y update
sudo apt-get install -y --force-yes pypy
;;
esac

sudo pip install virtualenv
fi

git config --global user.email "[email protected]"
git config --global user.name "pip"

virtualenv ~/.venv
source ~/.venv/bin/activate

pip install --upgrade setuptools
pip install tox

if [[ "$(uname -s)" == "Darwin" ]]; then
pyenv rehash
fi
3 changes: 0 additions & 3 deletions .travis/run.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
#!/bin/bash

set -e
set -x

# This is required in order to get UTF-8 output inside of the subprocesses that
# our tests use.
export LC_CTYPE=en_US.UTF-8

source ~/.venv/bin/activate

case $TOXENV in
py32)
tox
Expand Down

0 comments on commit 7e73304

Please sign in to comment.