aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-12-07 20:40:23 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-12-07 20:40:23 -0600
commit3fd2f7ac71ecdf26c7f85d8bce21714949e6933b (patch)
tree16fb0f67a40a1531bc9a1492e76f625ef7616b6d /tox.ini
parent69d3cadf8e8d6eb115cf0a1d85ccf686c0c2a833 (diff)
parented48066a3f8e58af58926a17906540213e57f88e (diff)
downloadcryptography-3fd2f7ac71ecdf26c7f85d8bce21714949e6933b.tar.gz
cryptography-3fd2f7ac71ecdf26c7f85d8bce21714949e6933b.tar.bz2
cryptography-3fd2f7ac71ecdf26c7f85d8bce21714949e6933b.zip
Merge pull request #2513 from alex/bin-pytest
pin pytest to disallow 2.8.4 which breaks tests
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
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