aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-12-07 19:57:51 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-12-07 19:57:51 -0500
commited48066a3f8e58af58926a17906540213e57f88e (patch)
tree4edb18e0a6c08798811057c02948a83e16395d84
parent9ec0c8e33be79a27f2c38ad3da98a1315928ce39 (diff)
downloadcryptography-ed48066a3f8e58af58926a17906540213e57f88e.tar.gz
cryptography-ed48066a3f8e58af58926a17906540213e57f88e.tar.bz2
cryptography-ed48066a3f8e58af58926a17906540213e57f88e.zip
pin pytest to disallow 2.8.4 which breaks tests
-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 c409ff92..9aca5dd4 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -7,7 +7,7 @@ iso8601
pep8-naming
pretend
pyasn1_modules
-pytest
+pytest!=2.8.4
requests
sphinx==1.3.1
sphinx_rtd_theme
diff --git a/setup.py b/setup.py
index 19f1e663..43fe17e7 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",
+ "pytest!=2.8.4",
"pretend",
"iso8601",
"hypothesis",
diff --git a/tox.ini b/tox.ini
index 63f1e4bd..cf899b74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ deps =
coverage
iso8601
pretend
- pytest
+ pytest!=2.8.4
hypothesis>=1.11.4
pyasn1_modules
./vectors