diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-07-09 11:29:25 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-07-09 11:29:25 +0200 |
| commit | 8cfa5ad3062c9c84c1606845f3ba08922c3d8320 (patch) | |
| tree | 13e1b382a0bb07be13045c9eee13b67ce869ac43 /.travis.yml | |
| parent | aa1615eafd0b538ac289d901c3096b5e9c8bcbc2 (diff) | |
| download | mitmproxy-8cfa5ad3062c9c84c1606845f3ba08922c3d8320.tar.gz mitmproxy-8cfa5ad3062c9c84c1606845f3ba08922c3d8320.tar.bz2 mitmproxy-8cfa5ad3062c9c84c1606845f3ba08922c3d8320.zip | |
update osx travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index eda57384..21e99f1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,9 @@ matrix: include: - python: 3.5 env: TOXENV=lint - - language: generic - os: osx - osx_image: xcode7.1 - git: - depth: 9999999 - env: TOXENV=py27 + - os: osx + language: generic + env: TOXENV=py35 - python: 3.5 env: TOXENV=py35 - python: 3.5 @@ -45,7 +42,7 @@ install: then brew update || brew update # try again if it fails brew outdated openssl || brew upgrade openssl - brew install python + brew install python python3 fi - pip install tox @@ -55,9 +52,9 @@ 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 + pip3 install -U virtualenv + ./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 |