aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-05-30 09:44:40 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-05-30 09:44:40 +0200
commit4f0657bc22b23db88870df92a519502c6e12db80 (patch)
tree7bd41142951d67c398e13fc2ccd3bdf8fb38544c
parent6652e3a36902f09148320b83954ff31a794852e6 (diff)
downloadmitmproxy-4f0657bc22b23db88870df92a519502c6e12db80.tar.gz
mitmproxy-4f0657bc22b23db88870df92a519502c6e12db80.tar.bz2
mitmproxy-4f0657bc22b23db88870df92a519502c6e12db80.zip
activate flake8 for good!
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 435c2ff8..fca596fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ install:
before_script:
- "openssl version -a"
- "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
- - "[[ $(flake8 -qq --count --exit-zero mitmproxy netlib pathod examples test) -le 3 ]]"
+ - "flake8 --count mitmproxy netlib pathod examples test"
script:
- "py.test --timeout 60 --cov netlib --cov mitmproxy --cov pathod ./test/$SCOPE"
diff --git a/tox.ini b/tox.ini
index 9984eb1b..38cf94a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,4 +7,4 @@ commands = py.test -n 8 --timeout 60 ./test/netlib ./test/mitmproxy/script ./tes
[testenv:lint]
deps = flake8
-commands = flake8 --exit-zero --count mitmproxy netlib pathod examples test
+commands = flake8 --count mitmproxy netlib pathod examples test