aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-07 12:14:51 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-07 12:14:51 -0500
commit78f6b5106a07129d9761658dc800ed2f391b86bd (patch)
treec612955bae2f94ea31ba81d50e0b681c4bd61118
parent7a477d3769c4f201088d539713354fb90446af77 (diff)
downloadcryptography-78f6b5106a07129d9761658dc800ed2f391b86bd.tar.gz
cryptography-78f6b5106a07129d9761658dc800ed2f391b86bd.tar.bz2
cryptography-78f6b5106a07129d9761658dc800ed2f391b86bd.zip
unpin pytest now that 2.8.2 is released
-rw-r--r--dev-requirements.txt2
-rw-r--r--setup.py2
-rw-r--r--tox.ini2
3 files changed, 3 insertions, 3 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 6130eb37..d82c13b6 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -5,7 +5,7 @@ invoke
iso8601
pep8-naming
pretend
-pytest<2.8
+pytest
requests
sphinx
sphinx_rtd_theme
diff --git a/setup.py b/setup.py
index 5db84773..7afa84c3 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,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",
+ "pytest",
"pretend",
"iso8601",
"hypothesis",
diff --git a/tox.ini b/tox.ini
index 016aada0..1ed03a5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ deps =
coverage
iso8601
pretend
- pytest<2.8
+ pytest
hypothesis>=1.11.4
./vectors
passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME