diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-12 01:04:58 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-12 01:04:58 -0500 |
| commit | 06042de08fb9ff549b9c9cb7244e7f27ff57eece (patch) | |
| tree | 9d6a3d9f40b5c57367d5a260b33a03fd37a21831 | |
| parent | f2dab8943a5abb2622092250fdd9700e618190c4 (diff) | |
| parent | 1e555aa2aa7eebe46330f5874e9bb4c2ce01e76d (diff) | |
| download | cryptography-06042de08fb9ff549b9c9cb7244e7f27ff57eece.tar.gz cryptography-06042de08fb9ff549b9c9cb7244e7f27ff57eece.tar.bz2 cryptography-06042de08fb9ff549b9c9cb7244e7f27ff57eece.zip | |
Merge pull request #2522 from reaperhulk/unpin-pytest
Revert "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 9aca5dd4..c409ff92 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -7,7 +7,7 @@ iso8601 pep8-naming pretend pyasn1_modules -pytest!=2.8.4 +pytest 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!=2.8.4", + "pytest", "pretend", "iso8601", "hypothesis", @@ -7,7 +7,7 @@ deps = coverage iso8601 pretend - pytest!=2.8.4 + pytest hypothesis>=1.11.4 pyasn1_modules ./vectors |