aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml33
1 files changed, 15 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b78d331..b0a4ea10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,20 +14,21 @@ matrix:
fast_finish: true
include:
- python: 2.7
+ env: TOXENV=py27
- python: 2.7
- env: NO_ALPN=1
+ env: TOXENV=py27 NO_ALPN=1
+ - python: 3.5
+ env: TOXENV=py35
+ - python: 3.5
+ env: TOXENV=py35 NO_ALPN=1
- language: generic
+ env: TOXENV=py27
os: osx
osx_image: xcode7.1
git:
depth: 9999999
- - python: 3.5
- env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_base.py test/pathod/test_language_http.py"
- - python: 3.5
- env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_base.py test/pathod/test_language_http.py" NO_ALPN=1
- python: 2.7
- env: DOCS=1
- script: 'cd docs && SPHINXOPTS="-W" make -e html'
+ env: TOXENV=docs
allow_failures:
- python: pypy
@@ -39,23 +40,20 @@ install:
brew outdated openssl || brew upgrade openssl
brew install python
fi
- - pip install -U virtualenv
- - ./dev.sh
- - source venv/bin/activate
before_script:
- - "openssl version -a"
- - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
- - "flake8 --jobs 4 --count mitmproxy netlib pathod examples test"
+ - "pip install tox"
+ - "tox -e lint"
-script:
- - "py.test --timeout 60 --cov netlib --cov mitmproxy --cov pathod test/$SCOPE"
+script: tox
after_success:
- - coveralls
- |
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
pip install -e ./release
python ./release/rtool.py bdist
python ./release/rtool.py upload-snapshot --bdist --wheel
@@ -71,7 +69,6 @@ notifications:
cache:
directories:
- - $HOME/build/mitmproxy/mitmproxy/venv
+ - $HOME/build/mitmproxy/mitmproxy/.tox
- $HOME/.cache/pip
- $HOME/.pyenv
- - $HOME/Library/Caches/pip