Merge pull request #2726 from alex/hypothesis-2.6

Don't try to use hypothesis on Python 2.6, upstream dropped support
pyca · Mar 1, 2016 · be6a25c · be6a25c
1 parent f10db01
commit be6a25c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -61,9 +61,11 @@
     "pytest",
     "pretend",
     "iso8601",
-    "hypothesis>=1.11.4",
     "pyasn1_modules",
 ]
+if sys.version_info[:2] > (2, 6):
+    test_requirements.append("hypothesis>=1.11.4")
+
 
 # If there's no vectors locally that probably means we are in a tarball and
 # need to go and get the matching vectors package from PyPi

diff --git a/tests/hypothesis/__init__.py b/tests/hypothesis/__init__.py
@@ -3,3 +3,7 @@
 # for complete details.
 
 from __future__ import absolute_import, division, print_function
+
+import pytest
+# hypothesis no longer supports Python 2.6 so we simply skip it there
+pytest.importorskip("hypothesis")