diff options
author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-05-24 10:36:29 +0200 |
---|---|---|
committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-05-24 11:35:53 +0200 |
commit | 0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa (patch) | |
tree | 4fa262ae8f5fa132860724df74e22696fce3197b /setup.py | |
parent | 4961d782ed344b5f36bf5b44b8b4b247dcef2605 (diff) | |
download | mitmproxy-0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa.tar.gz mitmproxy-0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa.tar.bz2 mitmproxy-0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa.zip |
upgrade pytest and remove our pytest.raises wrapper
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 27 |
1 files changed, 10 insertions, 17 deletions
@@ -61,8 +61,9 @@ setup( # It is not considered best practice to use install_requires to pin dependencies to specific versions. install_requires=[ "blinker>=1.4, <1.5", - "click>=6.2, <7", + "brotlipy>=0.5.1, <0.7", "certifi>=2015.11.20.1", # no semver here - this should always be on the last release! + "click>=6.2, <7", "construct>=2.8, <2.9", "cryptography>=1.4, <1.9", "cssutils>=1.0.1, <1.1", @@ -79,37 +80,29 @@ setup( "pyperclip>=1.5.22, <1.6", "requests>=2.9.1, <3", "ruamel.yaml>=0.13.2, <0.15", + "sortedcontainers>=1.5.4, <1.6", "tornado>=4.3, <4.6", "urwid>=1.3.1, <1.4", - "brotlipy>=0.5.1, <0.7", - "sortedcontainers>=1.5.4, <1.6", - # transitive from cryptography, we just blacklist here. - # https://github.com/pypa/setuptools/issues/861 - "setuptools>=11.3, !=29.0.0", ], extras_require={ ':sys_platform == "win32"': [ "pydivert>=2.0.3, <2.1", ], - ':sys_platform != "win32"': [ - ], 'dev': [ - "Flask>=0.10.1, <0.13", "flake8>=3.2.1, <3.4", + "Flask>=0.10.1, <0.13", "mypy>=0.501, <0.502", - "rstcheck>=2.2, <4.0", - "tox>=2.3, <3", - "pytest>=3, <3.1", "pytest-cov>=2.2.1, <3", + "pytest-faulthandler>=1.3.0, <2", "pytest-timeout>=1.0.0, <2", "pytest-xdist>=1.14, <2", - "pytest-faulthandler>=1.3.0, <2", - "sphinx>=1.3.5, <1.7", + "pytest>=3.1, <4", + "rstcheck>=2.2, <4.0", + "sphinx_rtd_theme>=0.1.9, <0.3", "sphinx-autobuild>=0.5.2, <0.7", + "sphinx>=1.3.5, <1.7", "sphinxcontrib-documentedlist>=0.5.0, <0.7", - "sphinx_rtd_theme>=0.1.9, <0.3", - ], - 'contentviews': [ + "tox>=2.3, <3", ], 'examples': [ "beautifulsoup4>=4.4.1, <4.7", |