Permalink
Browse files

Revert cffi==0.4 pinning on non-pypy interpreters

Apparently 0.4 has some issues on CPython on some platforms or at least
the one travis is using.
  • Loading branch information...
1 parent bb5907b commit 34476f09b015cbe0247da0353b8618d7d0a6dcbd @DasIch committed Apr 5, 2013
Showing with 9 additions and 1 deletion.
  1. +9 −1 setup.py
View
@@ -3,6 +3,11 @@
import sys
from setuptools import setup
+try:
+ import __pypy__
+except ImportError:
+ __pypy__ = None
+
# If cffi is available we can import all our ffi stuff and compile it as
# extensions, if it isn't for example when installing from PyPI we skip this.
try:
@@ -70,7 +75,10 @@ def get_long_description():
"pwhash-config = pwhash.config:run"
]
},
- install_requires=["cffi==0.4", "docopt>=0.6.0"],
+ install_requires=[
+ "cffi>=0.5" if __pypy__ is None else "cffi==0.4",
+ "docopt>=0.6.0"
+ ],
extras_require=extras_require,
zip_safe=False,
ext_modules=ext_modules,

0 comments on commit 34476f0

Please sign in to comment.