From 1e555aa2aa7eebe46330f5874e9bb4c2ce01e76d Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 11 Dec 2015 22:24:36 -0600 Subject: Revert "pin pytest to disallow 2.8.4 which breaks tests" This reverts commit ed48066a3f8e58af58926a17906540213e57f88e. --- dev-requirements.txt | 2 +- setup.py | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 9aca5dd4..c409ff92 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -7,7 +7,7 @@ iso8601 pep8-naming pretend pyasn1_modules -pytest!=2.8.4 +pytest requests sphinx==1.3.1 sphinx_rtd_theme diff --git a/setup.py b/setup.py index 43fe17e7..19f1e663 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ else: # If you add a new dep here you probably need to add it in the tox.ini as well test_requirements = [ - "pytest!=2.8.4", + "pytest", "pretend", "iso8601", "hypothesis", diff --git a/tox.ini b/tox.ini index cf899b74..63f1e4bd 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ deps = coverage iso8601 pretend - pytest!=2.8.4 + pytest hypothesis>=1.11.4 pyasn1_modules ./vectors -- cgit v1.2.3