diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-19 13:12:35 -0500 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-19 13:12:35 -0500 |
commit | 298d25ad89362f77eb1bb70de8fa6e756b38d628 (patch) | |
tree | f021254f2d3de6c8f269e6d9352cd4d8eceb2609 | |
parent | 336aca34f271fabf9defbaf087d24f0d2ded75af (diff) | |
parent | 959403b6df03ff5beb4cb12015f29c6c3e9a02e0 (diff) | |
download | cryptography-298d25ad89362f77eb1bb70de8fa6e756b38d628.tar.gz cryptography-298d25ad89362f77eb1bb70de8fa6e756b38d628.tar.bz2 cryptography-298d25ad89362f77eb1bb70de8fa6e756b38d628.zip |
Merge pull request #2355 from alex/pin-pytest
Pin pytest to <2.8, there's a bug with deprecation warnings
-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 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 @@ -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", ] @@ -7,7 +7,7 @@ deps = coverage iso8601 pretend - pytest + pytest<2.8 ./vectors passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME commands = |