aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-02-15 19:43:55 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-02-15 19:43:55 +0100
commita78c6f1cb085ad0d497b2d1798573a951a13f8b7 (patch)
tree38874c7fd2e9cc581b8f5ca6f62a9f6869f7c671 /.travis.yml
parentfc9fa87827d64c770d329b24151f3ef354054d74 (diff)
downloadmitmproxy-a78c6f1cb085ad0d497b2d1798573a951a13f8b7.tar.gz
mitmproxy-a78c6f1cb085ad0d497b2d1798573a951a13f8b7.tar.bz2
mitmproxy-a78c6f1cb085ad0d497b2d1798573a951a13f8b7.zip
update README.rst, minor fixes
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index f9a6aa66..fd1e3791 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
- python: 3.5
env: SCOPE="netlib"
- python: 3.5
- env: NO_ALPN=1 SCOPE="netlib"
+ env: SCOPE="netlib" NO_ALPN=1
- python: 2.7
env: DOCS=1
script: 'cd mitmproxy/docs && make html'
@@ -44,7 +44,7 @@ before_script:
- "openssl version -a"
script:
- - "py.test -s --cov libmproxy --cov netlib --cov libpathod --timeout 30 ./test/$SCOPE"
+ - "py.test -s --cov-config .coveragerc --timeout 30 ./test/$SCOPE"
after_success:
- coveralls