aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-10-31 11:16:42 +0100
committerGitHub <noreply@github.com>2017-10-31 11:16:42 +0100
commit1d55d241f8f3c3c49a67777de42c9636a39c93db (patch)
treea4a20814f53e4052e89ebc531f7e1898b12e5e6f
parent731b40ce0f31e64e9bff87e00d7bfbee12138d47 (diff)
parent80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0 (diff)
downloadmitmproxy-1d55d241f8f3c3c49a67777de42c9636a39c93db.tar.gz
mitmproxy-1d55d241f8f3c3c49a67777de42c9636a39c93db.tar.bz2
mitmproxy-1d55d241f8f3c3c49a67777de42c9636a39c93db.zip
Merge pull request #2615 from Kriechi/bump-flake
bump flake8
-rw-r--r--setup.cfg2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index b8e129ee..eaabfa12 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
[flake8]
max-line-length = 140
max-complexity = 25
-ignore = E251,C901,W503,W292
+ignore = E251,C901,W503,W292,E722,E741
exclude = mitmproxy/contrib/*,test/mitmproxy/data/*,release/build/*
addons = file,open,basestring,xrange,unicode,long,cmp
diff --git a/setup.py b/setup.py
index 9c20cdc9..8e68e217 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ setup(
"pydivert>=2.0.3,<2.2",
],
'dev': [
- "flake8>=3.2.1, <3.5",
+ "flake8>=3.5, <3.6",
"Flask>=0.10.1, <0.13",
"mypy>=0.530,<0.541",
"pytest-cov>=2.2.1, <3",