From 4cf381137643c2d78e8631f3f439daef62a97a67 Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Tue, 24 Feb 2015 10:51:53 -0500 Subject: [PATCH] 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). --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2324d54f3ccb..d8c0790fed21 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ VECTORS_DEPENDENCY = "cryptography_vectors=={0}".format(about['__version__']) requirements = [ - CFFI_DEPENDENCY, "pyasn1", SIX_DEPENDENCY, SETUPTOOLS_DEPENDENCY @@ -44,6 +43,9 @@ 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",