Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade pytest and remove our pytest.raises wrapper

This commit is contained in:
Thomas Kriechbaumer 2017-05-24 10:36:29 +02:00
parent 4961d782ed
commit 0bd3d0ff4c
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
setup.py
View File

@ -61,8 +61,9 @@ setup(
# It is not considered best practice to use install_requires to pin dependencies to specific versions. # It is not considered best practice to use install_requires to pin dependencies to specific versions.
install_requires=[ install_requires=[
"blinker>=1.4, <1.5", "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! "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", "construct>=2.8, <2.9",
"cryptography>=1.4, <1.9", "cryptography>=1.4, <1.9",
"cssutils>=1.0.1, <1.1", "cssutils>=1.0.1, <1.1",
@ -79,37 +80,29 @@ setup(
"pyperclip>=1.5.22, <1.6", "pyperclip>=1.5.22, <1.6",
"requests>=2.9.1, <3", "requests>=2.9.1, <3",
"ruamel.yaml>=0.13.2, <0.15", "ruamel.yaml>=0.13.2, <0.15",
"sortedcontainers>=1.5.4, <1.6",
"tornado>=4.3, <4.6", "tornado>=4.3, <4.6",
"urwid>=1.3.1, <1.4", "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={ extras_require={
':sys_platform == "win32"': [ ':sys_platform == "win32"': [
"pydivert>=2.0.3, <2.1", "pydivert>=2.0.3, <2.1",
], ],
':sys_platform != "win32"': [
],
'dev': [ 'dev': [
"Flask>=0.10.1, <0.13",
"flake8>=3.2.1, <3.4", "flake8>=3.2.1, <3.4",
"Flask>=0.10.1, <0.13",
"mypy>=0.501, <0.502", "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-cov>=2.2.1, <3",
"pytest-faulthandler>=1.3.0, <2",
"pytest-timeout>=1.0.0, <2", "pytest-timeout>=1.0.0, <2",
"pytest-xdist>=1.14, <2", "pytest-xdist>=1.14, <2",
"pytest-faulthandler>=1.3.0, <2", "pytest>=3.1, <4",
"sphinx>=1.3.5, <1.7", "rstcheck>=2.2, <4.0",
"sphinx-autobuild>=0.5.2, <0.7",
"sphinxcontrib-documentedlist>=0.5.0, <0.7",
"sphinx_rtd_theme>=0.1.9, <0.3", "sphinx_rtd_theme>=0.1.9, <0.3",
], "sphinx-autobuild>=0.5.2, <0.7",
'contentviews': [ "sphinx>=1.3.5, <1.7",
"sphinxcontrib-documentedlist>=0.5.0, <0.7",
"tox>=2.3, <3",
], ],
'examples': [ 'examples': [
"beautifulsoup4>=4.4.1, <4.7", "beautifulsoup4>=4.4.1, <4.7",

18
test/conftest.py
View File

@ -32,21 +32,3 @@ skip_appveyor = pytest.mark.skipif(
def disable_alpn(monkeypatch): def disable_alpn(monkeypatch):
monkeypatch.setattr(mitmproxy.net.tcp, 'HAS_ALPN', False) monkeypatch.setattr(mitmproxy.net.tcp, 'HAS_ALPN', False)
monkeypatch.setattr(OpenSSL.SSL._lib, 'Cryptography_HAS_ALPN', False) monkeypatch.setattr(OpenSSL.SSL._lib, 'Cryptography_HAS_ALPN', False)
################################################################################
# TODO: remove this wrapper when pytest 3.1.0 is released
original_pytest_raises = pytest.raises
@contextmanager
@functools.wraps(original_pytest_raises)
def raises(exc, *args, **kwargs):
with original_pytest_raises(exc, *args, **kwargs) as exc_info:
yield
if 'match' in kwargs:
assert exc_info.match(kwargs['match'])
pytest.raises = raises
################################################################################