Skip to content

Commit

Permalink
Merge pull request #674 from dangra/pypy
Browse files Browse the repository at this point in the history
[WIP] try to restore pypy tests
  • Loading branch information
dangra committed Apr 3, 2014
2 parents ade7662 + 95853b3 commit f3d1508
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .travis-workarounds.sh
@@ -0,0 +1,12 @@
#!/bin/bash
set -e
set -x

if [[ "${TOXENV}" == "pypy" ]]; then
sudo add-apt-repository -y ppa:pypy/ppa
sudo apt-get -qy update
sudo apt-get install -y pypy pypy-dev
# This is required because we need to get rid of the Travis installed PyPy
# or it'll take precedence over the PPA installed one.
sudo rm -rf /usr/local/pypy/bin
fi
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -9,7 +9,8 @@ matrix:
allow_failures:
- env: TOXENV=pypy
install:
- pip install -M tox
- ./.travis-workarounds.sh
- pip install tox
script: tox
notifications:
irc:
Expand Down

0 comments on commit f3d1508

Please sign in to comment.