diff options
| author | Donald Stufft <donald@stufft.io> | 2014-12-18 13:35:33 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-12-18 13:35:33 -0500 |
| commit | 187f31eb7997a6000ab8649317df862ba2fe7836 (patch) | |
| tree | 84858e009f1cab870a570c3a97c5e2362b110d9b | |
| parent | 1af85e57a05e0028ccaf79de3ccb299f55deb478 (diff) | |
| parent | 5bea5ca0233be05e09d8c62fdeae86187e73a48e (diff) | |
| download | cryptography-187f31eb7997a6000ab8649317df862ba2fe7836.tar.gz cryptography-187f31eb7997a6000ab8649317df862ba2fe7836.tar.bz2 cryptography-187f31eb7997a6000ab8649317df862ba2fe7836.zip | |
Merge pull request #1549 from reaperhulk/no-enum34-on-34-plus
make enum34 installation conditional on python < 3.4
| -rw-r--r-- | setup.py | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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", |