aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-28 19:44:25 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-28 19:44:25 -0700
commitf69972d13d9c6bfc5f59e71c1253b8d81003d064 (patch)
tree792adf802d32544065c1566cbc86930eb40aa808 /.travis.yml
parent3b53d3e393f30879420b4407583c42bb1f51563e (diff)
downloadmitmproxy-f69972d13d9c6bfc5f59e71c1253b8d81003d064.tar.gz
mitmproxy-f69972d13d9c6bfc5f59e71c1253b8d81003d064.tar.bz2
mitmproxy-f69972d13d9c6bfc5f59e71c1253b8d81003d064.zip
simplify tox setup
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml23
1 files changed, 14 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index a01bf055..24a0a5c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,23 +10,31 @@ addons:
packages:
- libssl-dev
+env:
+ global:
+ - TOXENV=py
+ - CI_DEPS=codecov>=2.0.5
+ - CI_COMMANDS=codecov
+
matrix:
fast_finish: true
include:
- python: 2.7
- env: TOXENV=py27-ci
+ env: TOXENV=py27
- python: 2.7
- env: TOXENV=py27-ci NO_ALPN=1
+ env: TOXENV=py27 NO_ALPN=1
- python: 3.5
- env: TOXENV=py35-ci
+ env: TOXENV=py35
- python: 3.5
- env: TOXENV=py35-ci NO_ALPN=1
+ env: TOXENV=py35 NO_ALPN=1
- language: generic
- env: TOXENV=py27-ci
os: osx
osx_image: xcode7.1
git:
depth: 9999999
+ env: TOXENV=py27
+ - python: 3.5
+ env: TOXENV=lint
- python: 2.7
env: TOXENV=docs
allow_failures:
@@ -42,10 +50,7 @@ install:
fi
- pip install tox
-before_script:
- - "tox -e lint"
-
-script: tox
+script: tox -- --cov netlib --cov mitmproxy --cov pathod
after_success:
- |