diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-07 00:00:20 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-07 00:00:20 -0700 |
| commit | 4f3ace1a629d4cc198faea27e18afec6f100097f (patch) | |
| tree | 51595ed7dd73c00043e557fde78859815a2df6f3 | |
| parent | e115859bbd6759016bf96e2109a4cfa609560cc7 (diff) | |
| parent | 437866ebf93c654c39a25425967c31c97935833a (diff) | |
| download | mitmproxy-4f3ace1a629d4cc198faea27e18afec6f100097f.tar.gz mitmproxy-4f3ace1a629d4cc198faea27e18afec6f100097f.tar.bz2 mitmproxy-4f3ace1a629d4cc198faea27e18afec6f100097f.zip | |
Merge branch 'port-pathod-language-writer'
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 1cb5075e..bba9a67f 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_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.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_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.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 test/pathod/test_language_websocket.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_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.py" NO_ALPN=1 - python: 2.7 env: DOCS=1 script: 'cd docs && SPHINXOPTS="-W" make -e html' |