aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-06 11:41:51 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-06 11:41:51 -0700
commit1e1b4fd88dd16b3b6b8c2cbf9337cba4dffa6c68 (patch)
tree448b8d1530a0e59cc87dd3cc23c0239f00355c9b
parent1214085f67457865aff4307b847ee4264fec2bd1 (diff)
downloadmitmproxy-1e1b4fd88dd16b3b6b8c2cbf9337cba4dffa6c68.tar.gz
mitmproxy-1e1b4fd88dd16b3b6b8c2cbf9337cba4dffa6c68.tar.bz2
mitmproxy-1e1b4fd88dd16b3b6b8c2cbf9337cba4dffa6c68.zip
fix travis tests on master
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 5f065d53..b77091b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,9 @@ matrix:
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_writer.py test/pathod/test_language_base.py"
+ 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"
- 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_writer.py test/pathod/test_language_base.py" NO_ALPN=1
+ 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" NO_ALPN=1
- python: 2.7
env: DOCS=1
script: 'cd docs && make html'