summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-01-15 16:36:05 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-01-15 16:36:05 -0500
commit2c88b7e217de80a07c0284261b176bb11bf6e1ee (patch)
tree33679e27a8ac5a7098346970a471c66dc1fab7f9
parent9a4f1a0f6c89e3e56b955e5acc6c0001e418443d (diff)
parent7ab5c39d859cb39b23b196f88e7b8881357b1262 (diff)
downloadcryptography-2c88b7e217de80a07c0284261b176bb11bf6e1ee.tar.gz
Merge pull request #1627 from reaperhulk/0.7.2-backport-enum34-change
[0.7.2 backport] make enum34 installation conditional on python < 3.4
-rw-r--r--setup.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index ead5ec4f9..32a87ba3c 100644
--- a/setup.py
+++ b/setup.py
@@ -36,12 +36,14 @@ VECTORS_DEPENDENCY = "cryptography_vectors=={0}".format(about['__version__'])
requirements = [
CFFI_DEPENDENCY,
- "enum34",
"pyasn1",
SIX_DEPENDENCY,
SETUPTOOLS_DEPENDENCY
]
+if sys.version_info < (3, 4):
+ requirements.append("enum34")
+
# If you add a new dep here you probably need to add it in the tox.ini as well
test_requirements = [
"pytest",