diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-12-07 20:40:23 -0600 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-12-07 20:40:23 -0600 |
commit | 3fd2f7ac71ecdf26c7f85d8bce21714949e6933b (patch) | |
tree | 16fb0f67a40a1531bc9a1492e76f625ef7616b6d | |
parent | 69d3cadf8e8d6eb115cf0a1d85ccf686c0c2a833 (diff) | |
parent | ed48066a3f8e58af58926a17906540213e57f88e (diff) | |
download | cryptography-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
-rw-r--r-- | dev-requirements.txt | 2 | ||||
-rw-r--r-- | setup.py | 2 | ||||
-rw-r--r-- | tox.ini | 2 |
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 @@ -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", @@ -7,7 +7,7 @@ deps = coverage iso8601 pretend - pytest + pytest!=2.8.4 hypothesis>=1.11.4 pyasn1_modules ./vectors |