aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-01-27 10:57:07 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-02-04 09:52:25 +0100
commitef7b4f56aff3251fd5ae69f5406c17816f5fd558 (patch)
tree143f460fae837788c81f5eb6c89a1a0055411c91 /.travis.yml
parent8d14dd33d083eafb4f12cd88269f1b11b1a65ee8 (diff)
downloadmitmproxy-ef7b4f56aff3251fd5ae69f5406c17816f5fd558.tar.gz
mitmproxy-ef7b4f56aff3251fd5ae69f5406c17816f5fd558.tar.bz2
mitmproxy-ef7b4f56aff3251fd5ae69f5406c17816f5fd558.zip
update CI integration
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml22
1 files changed, 18 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 2233f67b..9091887a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,19 @@ install:
brew outdated openssl || brew upgrade openssl
brew install python
fi
+ - |
+ if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
+ export PYENV_ROOT="$HOME/.pyenv"
+ if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
+ pushd "$PYENV_ROOT" && git pull && popd
+ else
+ rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
+ fi
+ export PYPY_VERSION="4.0.1"
+ "$PYENV_ROOT/bin/pyenv" install --skip-existing "pypy-$PYPY_VERSION"
+ virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
+ source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
+ fi
- "pip install -U pip setuptools"
- "pip install --src .. -r requirements.txt"
@@ -90,7 +103,8 @@ before_cache:
cache:
directories:
- $HOME/.cache/pip
- - /home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages
- - /home/travis/virtualenv/python2.7.9/bin
- - /home/travis/virtualenv/pypy-2.5.0/site-packages
- - /home/travis/virtualenv/pypy-2.5.0/bin
+ - $HOME/virtualenv/python2.7.9/lib/python2.7/site-packages
+ - $HOME/virtualenv/python2.7.9/bin
+ - $HOME/.pyenv
+ - $HOME/virtualenv/pypy-2.5.0/site-packages
+ - $HOME/virtualenv/pypy-2.5.0/bin