aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-09-19 13:19:43 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-09-19 13:19:43 -0400
commit959403b6df03ff5beb4cb12015f29c6c3e9a02e0 (patch)
treef021254f2d3de6c8f269e6d9352cd4d8eceb2609
parent336aca34f271fabf9defbaf087d24f0d2ded75af (diff)
downloadcryptography-959403b6df03ff5beb4cb12015f29c6c3e9a02e0.tar.gz
cryptography-959403b6df03ff5beb4cb12015f29c6c3e9a02e0.tar.bz2
cryptography-959403b6df03ff5beb4cb12015f29c6c3e9a02e0.zip
Pin pytest to <2.8, there's a bug with deprecation warnings
-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 092b9914..440d3b0f 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -5,7 +5,7 @@ invoke
iso8601
pep8-naming
pretend
-pytest
+pytest<2.8
requests
sphinx
sphinx_rtd_theme
diff --git a/setup.py b/setup.py
index 444b488b..b36f3de6 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",
+ "pytest<2.8",
"pretend",
"iso8601",
]
diff --git a/tox.ini b/tox.ini
index 219da545..a890e38a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ deps =
coverage
iso8601
pretend
- pytest
+ pytest<2.8
./vectors
passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME
commands =