diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-07-09 14:39:12 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-07-10 12:48:48 +0200 |
| commit | ff63fadf0b34df1739a549a17998e56fb0d18f9b (patch) | |
| tree | a2aef7ea3ef56832cfb7d9f655b985d799800715 | |
| parent | 6762c6f5a28726eaa7703e47fdd3290becdbc14a (diff) | |
| download | mitmproxy-ff63fadf0b34df1739a549a17998e56fb0d18f9b.tar.gz mitmproxy-ff63fadf0b34df1739a549a17998e56fb0d18f9b.tar.bz2 mitmproxy-ff63fadf0b34df1739a549a17998e56fb0d18f9b.zip | |
move OSX Travis job to py3 for snapshots
| -rw-r--r-- | .travis.yml | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index eda57384..e9566ebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,10 @@ matrix: include: - python: 3.5 env: TOXENV=lint - - language: generic - os: osx - osx_image: xcode7.1 - git: - depth: 9999999 - env: TOXENV=py27 + - os: osx + osx_image: xcode7.3 + language: generic + env: TOXENV=py35 - python: 3.5 env: TOXENV=py35 - python: 3.5 @@ -44,20 +42,26 @@ install: if [[ $TRAVIS_OS_NAME == "osx" ]] then brew update || brew update # try again if it fails - brew outdated openssl || brew upgrade openssl - brew install python + brew upgrade + brew reinstall openssl + brew reinstall pyenv + eval "$(pyenv init -)" + env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install --skip-existing 3.5.2 + pyenv global 3.5.2 + pyenv shell 3.5.2 + pip install -U pip setuptools wheel virtualenv fi - pip install tox -script: set -o pipefail; tox -- --cov netlib --cov mitmproxy --cov pathod 2>&1 | grep -v Cryptography_locking_cb +script: set -o pipefail; python -m tox -- --cov netlib --cov mitmproxy --cov pathod 2>&1 | grep -v Cryptography_locking_cb after_success: - | if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]] then - pip install -U virtualenv - ./dev.sh - source venv/bin/activate + git fetch --unshallow + ./dev.sh 3.5 + source venv3.5/bin/activate pip install -e ./release python ./release/rtool.py bdist python ./release/rtool.py upload-snapshot --bdist --wheel @@ -71,4 +75,7 @@ notifications: on_failure: change on_start: never -cache: pip +cache: + directories: + - $HOME/.pyenv + - $HOME/.cache/pip |