diff options
author | Matthew Shao <me@matshao.com> | 2017-04-25 19:27:53 +0800 |
---|---|---|
committer | Matthew Shao <me@matshao.com> | 2017-04-25 19:27:53 +0800 |
commit | dcac976a47046da286005ae8755630d72d251de7 (patch) | |
tree | 19abcf86e60e3d15a955eb0c8efb2cddd71b2cfd /setup.py | |
parent | 15c19d2bc63e667a95bdc1f6f5b5af056264280f (diff) | |
parent | 161cdff25e440b3ec89b8f5a28f56d0d8159e5e5 (diff) | |
download | mitmproxy-dcac976a47046da286005ae8755630d72d251de7.tar.gz mitmproxy-dcac976a47046da286005ae8755630d72d251de7.tar.bz2 mitmproxy-dcac976a47046da286005ae8755630d72d251de7.zip |
Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest-dev
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -70,15 +70,15 @@ setup( "html2text>=2016.1.8, <=2016.9.19", "hyperframe>=5.0, <6", "jsbeautifier>=1.6.3, <1.7", - "kaitaistruct>=0.6, <0.7", + "kaitaistruct>=0.7, <0.8", "passlib>=1.6.5, <1.8", "pyasn1>=0.1.9, <0.3", - "pyOpenSSL>=16.0, <17.0", + "pyOpenSSL>=16.0, <17.1", "pyparsing>=2.1.3, <2.3", "pyperclip>=1.5.22, <1.6", "requests>=2.9.1, <3", "ruamel.yaml>=0.13.2, <0.15", - "tornado>=4.3, <4.5", + "tornado>=4.3, <4.6", "urwid>=1.3.1, <1.4", "watchdog>=0.8.3, <0.9", "brotlipy>=0.5.1, <0.7", @@ -113,7 +113,7 @@ setup( ], 'examples': [ "beautifulsoup4>=4.4.1, <4.6", - "Pillow>=3.2, <4.1", + "Pillow>=3.2, <4.2", ] } ) |