aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-08-15 16:32:18 +0200
committerGitHub <noreply@github.com>2017-08-15 16:32:18 +0200
commit68839077b6e93af9ac6d7c6894751e41d715c9b2 (patch)
treeff97e496c13ce9d48270cd6c6e52f75594bddc86 /setup.py
parent38237f8a0f79e125d36e271abdf778a0e4379e0c (diff)
downloadmitmproxy-68839077b6e93af9ac6d7c6894751e41d715c9b2.tar.gz
mitmproxy-68839077b6e93af9ac6d7c6894751e41d715c9b2.tar.bz2
mitmproxy-68839077b6e93af9ac6d7c6894751e41d715c9b2.zip
Revert "Fix version conflict"
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 41704fae..739d1538 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,6 @@ setup(
"h2>=3.0, <4",
"html2text>=2016.1.8, <=2016.9.19",
"hyperframe>=5.0, <6",
- "idna==2.5", # till newer version of requests is released
"jsbeautifier>=1.6.3, <1.7",
"kaitaistruct>=0.7, <0.8",
"ldap3>=2.2.0, <2.4",