aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2020-04-08 20:21:12 +0200
committerMaximilian Hils <git@maximilianhils.com>2020-04-08 20:21:12 +0200
commit9d5305301a8e073cbb64bb6574e66bb34373935a (patch)
tree7f30b0412a9974751846c757d44889694d00dc7b /setup.py
parent40925181e9d64c727f75e89acf0205bb4b87bb3a (diff)
parent4d6886a0f4ebbf6bc66b74fa548ff724ba2ad660 (diff)
downloadmitmproxy-9d5305301a8e073cbb64bb6574e66bb34373935a.tar.gz
mitmproxy-9d5305301a8e073cbb64bb6574e66bb34373935a.tar.bz2
mitmproxy-9d5305301a8e073cbb64bb6574e66bb34373935a.zip
Merge remote-tracking branch 'origin/master' into fix-ci
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/setup.py b/setup.py
index 77b1098c..d2ff5f8c 100644
--- a/setup.py
+++ b/setup.py
@@ -66,25 +66,25 @@ setup(
"Brotli>=1.0,<1.1",
"certifi>=2019.9.11", # no semver here - this should always be on the last release!
"click>=7.0,<8",
- "cryptography>=2.1.4,<2.5",
+ "cryptography>=2.9,<3.0",
"flask>=1.1.1,<1.2",
- "h2>=3.0.1,<4",
+ "h2>=3.2.0,<4",
"hyperframe>=5.1.0,<6",
"kaitaistruct>=0.7,<0.9",
- "ldap3>=2.6.1,<2.7",
+ "ldap3>=2.6.1,<2.8",
"passlib>=1.6.5, <1.8",
- "protobuf>=3.6.0, <3.11",
+ "protobuf>=3.6.0, <3.12",
"pyasn1>=0.3.1,<0.5",
- "pyOpenSSL==19.0.0",
+ "pyOpenSSL>=19.1.0,<19.2",
"pyparsing>=2.4.2,<2.5",
- "pyperclip>=1.6.0,<1.8",
+ "pyperclip>=1.6.0,<1.9",
"ruamel.yaml>=0.16,<0.17",
"sortedcontainers>=2.1.0,<2.2",
"tornado>=4.3,<7",
"urwid>=2.1.0,<2.2",
- "wsproto>=0.14.0,<0.15.0",
+ "wsproto>=0.14,<0.16",
"publicsuffix2>=2.20190812,<3",
- "zstandard>=0.11.0,<0.13.0",
+ "zstandard>=0.11,<0.14",
],
extras_require={
':sys_platform == "win32"': [