diff options
| author | Julian Berman <Julian@GrayVines.com> | 2015-02-24 10:51:53 -0500 |
|---|---|---|
| committer | Julian Berman <Julian@GrayVines.com> | 2015-03-08 18:27:29 -0400 |
| commit | 4cf381137643c2d78e8631f3f439daef62a97a67 (patch) | |
| tree | d01de26528e0b07e00b47adc6c9a857c42e3177e /setup.py | |
| parent | 4733b47c9a6da998f01aee77c0ffb8c3bb321f5c (diff) | |
| download | cryptography-4cf381137643c2d78e8631f3f439daef62a97a67.tar.gz cryptography-4cf381137643c2d78e8631f3f439daef62a97a67.tar.bz2 cryptography-4cf381137643c2d78e8631f3f439daef62a97a67.zip | |
Remove the setuptools and CFFI requirements, which break pip install -U
PyPy ships with CFFI, but pip install -U will upgrade it if a newer CFFI
is available, which will break the CFFI installation (and PyPy itself).
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -35,7 +35,6 @@ SIX_DEPENDENCY = "six>=1.4.1" VECTORS_DEPENDENCY = "cryptography_vectors=={0}".format(about['__version__']) requirements = [ - CFFI_DEPENDENCY, "pyasn1", SIX_DEPENDENCY, SETUPTOOLS_DEPENDENCY @@ -44,6 +43,9 @@ requirements = [ if sys.version_info < (3, 4): requirements.append("enum34") +if platform.python_implementation() != "PyPy": + requirements.append(CFFI_DEPENDENCY) + # If you add a new dep here you probably need to add it in the tox.ini as well test_requirements = [ "pytest", |