From 882b8b5d80e308599bdb602a390edd8d2be065e4 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 5 Jul 2016 15:58:52 -0700 Subject: don't cache tox on CI --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 29d0897c..345d6a58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,8 +71,4 @@ notifications: on_failure: change on_start: never -cache: - directories: - - $HOME/build/mitmproxy/mitmproxy/.tox - - $HOME/.cache/pip - - $HOME/.pyenv +cache: pip -- cgit v1.2.3 From acca8e5253878d6a346a15a0f64154bdbde49a98 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Thu, 7 Jul 2016 20:56:39 +0200 Subject: reorder travis jobs --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 345d6a58..a0e3c370 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ addons: packages: - libssl-dev -env: +env: global: - CI_DEPS=codecov>=2.0.5 - CI_COMMANDS=codecov @@ -18,22 +18,22 @@ env: matrix: fast_finish: true include: - - python: 2.7 - env: TOXENV=py27 - - python: 2.7 - env: TOXENV=py27 NO_ALPN=1 + - python: 3.5 + env: TOXENV=lint - python: 3.5 env: TOXENV=py35 - python: 3.5 env: TOXENV=py35 NO_ALPN=1 + - python: 2.7 + env: TOXENV=py27 + - python: 2.7 + env: TOXENV=py27 NO_ALPN=1 - language: generic os: osx osx_image: xcode7.1 git: depth: 9999999 env: TOXENV=py27 - - python: 3.5 - env: TOXENV=lint - python: 3.5 env: TOXENV=docs allow_failures: -- cgit v1.2.3 From 3d40fae6d759adc4d0862c52cb043cd3c9fa0cc8 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 9 Jul 2016 01:05:04 -0700 Subject: travis: move osx test to the top OSX is the slow one, so it should start straight away. --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index a0e3c370..eda57384 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,12 @@ matrix: include: - python: 3.5 env: TOXENV=lint + - language: generic + os: osx + osx_image: xcode7.1 + git: + depth: 9999999 + env: TOXENV=py27 - python: 3.5 env: TOXENV=py35 - python: 3.5 @@ -28,12 +34,6 @@ matrix: env: TOXENV=py27 - python: 2.7 env: TOXENV=py27 NO_ALPN=1 - - language: generic - os: osx - osx_image: xcode7.1 - git: - depth: 9999999 - env: TOXENV=py27 - python: 3.5 env: TOXENV=docs allow_failures: -- cgit v1.2.3 From 8cfa5ad3062c9c84c1606845f3ba08922c3d8320 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 9 Jul 2016 11:29:25 +0200 Subject: update osx travis --- .travis.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to '.travis.yml') 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 -- cgit v1.2.3 From 3a3d9f65e693ff0e0c6eb35c872d7a8b43f06dce Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 9 Jul 2016 11:50:30 +0200 Subject: upgrade pip on osx travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 21e99f1f..3aa2e75c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,8 @@ install: brew update || brew update # try again if it fails brew outdated openssl || brew upgrade openssl brew install python python3 + pip install -U pip setuptools wheel + pip3 install -U pip3 setuptools wheel fi - pip install tox -- cgit v1.2.3 From 3e2d41d507d9622991f10f5e75788098063f2134 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 9 Jul 2016 11:55:52 +0200 Subject: fix pip install on osx travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3aa2e75c..65200ac1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ install: brew outdated openssl || brew upgrade openssl brew install python python3 pip install -U pip setuptools wheel - pip3 install -U pip3 setuptools wheel + pip3 install -U pip setuptools wheel fi - pip install tox -- cgit v1.2.3 From 22c0db3b19cf14b0056d4fc32c62f31095c2e382 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 9 Jul 2016 22:31:00 +0200 Subject: revert travis osx changes --- .travis.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 65200ac1..eda57384 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,12 @@ matrix: include: - python: 3.5 env: TOXENV=lint - - os: osx - language: generic - env: TOXENV=py35 + - language: generic + os: osx + osx_image: xcode7.1 + git: + depth: 9999999 + env: TOXENV=py27 - python: 3.5 env: TOXENV=py35 - python: 3.5 @@ -42,9 +45,7 @@ install: then brew update || brew update # try again if it fails brew outdated openssl || brew upgrade openssl - brew install python python3 - pip install -U pip setuptools wheel - pip3 install -U pip setuptools wheel + brew install python fi - pip install tox @@ -54,9 +55,9 @@ after_success: - | if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]] then - pip3 install -U virtualenv - ./dev.sh 3.5 - source venv3.5/bin/activate + pip install -U virtualenv + ./dev.sh + source venv/bin/activate pip install -e ./release python ./release/rtool.py bdist python ./release/rtool.py upload-snapshot --bdist --wheel -- cgit v1.2.3 From ff63fadf0b34df1739a549a17998e56fb0d18f9b Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 9 Jul 2016 14:39:12 +0200 Subject: move OSX Travis job to py3 for snapshots --- .travis.yml | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to '.travis.yml') 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 -- cgit v1.2.3 From 6e7b86cd82dd9b379b0a57d423bbdcd74ba47256 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 14 Jul 2016 11:12:37 +1200 Subject: Disable OSX tests on Travis for now We'll re-enable as soon as this is sorted out: https://github.com/travis-ci/travis-ci/issues/6303 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e9566ebe..e832d058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,10 @@ matrix: include: - python: 3.5 env: TOXENV=lint - - os: osx - osx_image: xcode7.3 - language: generic - env: TOXENV=py35 +# - os: osx +# osx_image: xcode7.3 +# language: generic +# env: TOXENV=py35 - python: 3.5 env: TOXENV=py35 - python: 3.5 -- cgit v1.2.3