From b84a573407e8acb05cb3a973da65c4ae28bd3daa Mon Sep 17 00:00:00 2001 From: Bob Ippolito Date: Tue, 12 Apr 2011 11:33:35 -0700 Subject: do not try to build extension under PyPy --- .gitignore | 1 + CHANGES.txt | 1 + setup.py | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3202a98..e8eb43a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.egg-info +*.egg *.pyc *.so /build diff --git a/CHANGES.txt b/CHANGES.txt index 1a3631d..dee0097 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ Version 2.1.4 released XXXX-XX-XX +* Does not try to build the extension when using PyPy * Trailing whitespace after commas no longer emitted when indent is used * Migrated to github http://github.com/simplejson/simplejson diff --git a/setup.py b/setup.py index c61f5d2..bf38479 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,7 @@ from distutils.command.build_ext import build_ext from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError +IS_PYPY = hasattr(sys, 'pypy_translation_info') VERSION = '2.1.4' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" LONG_DESCRIPTION = open('README.rst', 'r').read() @@ -84,7 +85,7 @@ def run_setup(with_binary): ) try: - run_setup(True) + run_setup(not IS_PYPY) except BuildFailed: BUILD_EXT_WARNING = "WARNING: The C extension could not be compiled, speedups are not enabled." print '*' * 75 -- cgit v1.2.1