diff options
author | Henrique M. D <typoon@gmail.com> | 2019-11-15 13:59:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-15 13:59:57 -0500 |
commit | 021a14152125ee13657eea772fe3460b478ea099 (patch) | |
tree | 83794f1b3bafbcd7862300b5463dac27e43ff358 /setup.py | |
parent | 8972250167cfd55dcfcb93b2d3d7b33e0546629d (diff) | |
parent | 698f7e2e177baf313e6af62ec0f79a26693e430b (diff) | |
download | mitmproxy-021a14152125ee13657eea772fe3460b478ea099.tar.gz mitmproxy-021a14152125ee13657eea772fe3460b478ea099.tar.bz2 mitmproxy-021a14152125ee13657eea772fe3460b478ea099.zip |
Merge branch 'master' into fix-command-bar-issue-3259
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -72,7 +72,7 @@ setup( "kaitaistruct>=0.7,<0.9", "ldap3>=2.6.1,<2.7", "passlib>=1.6.5, <1.8", - "protobuf>=3.6.0, <3.10", + "protobuf>=3.6.0, <3.11", "pyasn1>=0.3.1,<0.5", "pyOpenSSL>=19.0.0,<20", "pyparsing>=2.4.2,<2.5", @@ -93,7 +93,7 @@ setup( "asynctest>=0.12.0", "flake8>=3.7.8,<3.8", "Flask>=1.0,<1.2", - "mypy>=0.590,<0.591", + "mypy>=0.740,<0.741", "parver>=0.1,<2.0", "pytest-asyncio>=0.10.0,<0.11", "pytest-cov>=2.7.1,<3", |