diff options
author | Aldo Cortesi <aldo@corte.si> | 2018-02-26 08:49:19 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-26 08:49:19 +1300 |
commit | b57f551c0d496f7e604cd1b3bf5f9bb2cf44f1bb (patch) | |
tree | 478ae2fe97d64504b7cdb8d107b8646beb0869a7 /setup.py | |
parent | ded94237642b3eb60589cb130c3c62bb8b052be4 (diff) | |
parent | a40dbc11b814d86de5164b02ca7be112eaab264b (diff) | |
download | mitmproxy-b57f551c0d496f7e604cd1b3bf5f9bb2cf44f1bb.tar.gz mitmproxy-b57f551c0d496f7e604cd1b3bf5f9bb2cf44f1bb.tar.bz2 mitmproxy-b57f551c0d496f7e604cd1b3bf5f9bb2cf44f1bb.zip |
Merge pull request #2921 from fristonio/Fix-2899
Remove h11 from dependencies and move requests to dev dependencies
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -66,7 +66,6 @@ setup( "certifi>=2015.11.20.1", # no semver here - this should always be on the last release! "click>=6.2, <7", "cryptography>=2.1.4,<2.2", - 'h11>=0.7.0,<0.8', "h2>=3.0.1,<4", "hyperframe>=5.1.0,<6", "kaitaistruct>=0.7,<0.9", @@ -76,7 +75,6 @@ setup( "pyOpenSSL>=17.5,<17.6", "pyparsing>=2.1.3, <2.3", "pyperclip>=1.6.0, <1.7", - "requests>=2.9.1, <3", "ruamel.yaml>=0.13.2, <0.16", "sortedcontainers>=1.5.4, <1.6", "tornado>=4.3, <4.6", @@ -96,6 +94,7 @@ setup( "pytest-timeout>=1.2.1,<2", "pytest-xdist>=1.22,<2", "pytest>=3.3,<4", + "requests>=2.9.1, <3", "tox>=2.3, <3", "rstcheck>=2.2, <4.0", ], |