diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-07 21:44:30 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-07 21:44:30 -0500 |
| commit | 26c776f71d0f548fdfc9122517923268d740d3af (patch) | |
| tree | e6f69805f7ee0f5aa5ef7ddc88a8c32709c3854d /setup.py | |
| parent | e36da1754dc04225f22db46c5b06602db377b429 (diff) | |
| parent | 3fd2f7ac71ecdf26c7f85d8bce21714949e6933b (diff) | |
| download | cryptography-26c776f71d0f548fdfc9122517923268d740d3af.tar.gz cryptography-26c776f71d0f548fdfc9122517923268d740d3af.tar.bz2 cryptography-26c776f71d0f548fdfc9122517923268d740d3af.zip | |
Merge branch 'master' into pypy-4.0.1
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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", |