aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-08-02 21:27:19 +0200
committerGitHub <noreply@github.com>2017-08-02 21:27:19 +0200
commit79354235a687ce8cd4b855b3b292fe3c432660c7 (patch)
tree99a56f2ce50921d55b625391750ff0c9424fd6e6
parent70a501e917c0cc5c4aa306d90483c8d8f2c11cbb (diff)
parentda38e36ea05b23af6dc6ab7722831eba5bed8436 (diff)
downloadmitmproxy-79354235a687ce8cd4b855b3b292fe3c432660c7.tar.gz
mitmproxy-79354235a687ce8cd4b855b3b292fe3c432660c7.tar.bz2
mitmproxy-79354235a687ce8cd4b855b3b292fe3c432660c7.zip
Merge pull request #2475 from mitmproxy/requires-io-master
[requires.io] dependency update on master branch
-rw-r--r--setup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 02dab61f..739d1538 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ setup(
"hyperframe>=5.0, <6",
"jsbeautifier>=1.6.3, <1.7",
"kaitaistruct>=0.7, <0.8",
- "ldap3>=2.2.0, <2.3",
+ "ldap3>=2.2.0, <2.4",
"passlib>=1.6.5, <1.8",
"pyasn1>=0.3.1, <0.4",
"pyOpenSSL>=17.2,<17.3",
@@ -88,7 +88,7 @@ setup(
"pydivert>=2.0.3, <2.1",
],
'dev': [
- "flake8>=3.2.1, <3.4",
+ "flake8>=3.2.1, <3.5",
"Flask>=0.10.1, <0.13",
"mypy>=0.521,<0.522",
"pytest-cov>=2.2.1, <3",