diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-07 15:55:31 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-07 15:55:31 -0400 |
| commit | cbc554c3ff6dd567f2af8669db0105a562d96f95 (patch) | |
| tree | c612955bae2f94ea31ba81d50e0b681c4bd61118 | |
| parent | 7a477d3769c4f201088d539713354fb90446af77 (diff) | |
| parent | 78f6b5106a07129d9761658dc800ed2f391b86bd (diff) | |
| download | cryptography-cbc554c3ff6dd567f2af8669db0105a562d96f95.tar.gz cryptography-cbc554c3ff6dd567f2af8669db0105a562d96f95.tar.bz2 cryptography-cbc554c3ff6dd567f2af8669db0105a562d96f95.zip | |
Merge pull request #2396 from reaperhulk/unpin-pytest
unpin pytest now that 2.8.2 is released
| -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 6130eb37..d82c13b6 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,7 +5,7 @@ invoke iso8601 pep8-naming pretend -pytest<2.8 +pytest 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<2.8", + "pytest", "pretend", "iso8601", "hypothesis", @@ -7,7 +7,7 @@ deps = coverage iso8601 pretend - pytest<2.8 + pytest hypothesis>=1.11.4 ./vectors passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME |