diff --git a/.gitignore b/.gitignore index 6e8dc56c01018389a23a49977f58a370df1f06a5_LmdpdGlnbm9yZQ==..50d38c5ed887bb78e876cc14ee84f36c1a8bbf01_LmdpdGlnbm9yZQ== 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.egg-info +*.egg *.pyc *.so /build diff --git a/CHANGES.txt b/CHANGES.txt index 6e8dc56c01018389a23a49977f58a370df1f06a5_Q0hBTkdFUy50eHQ=..50d38c5ed887bb78e876cc14ee84f36c1a8bbf01_Q0hBTkdFUy50eHQ= 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 6e8dc56c01018389a23a49977f58a370df1f06a5_c2V0dXAucHk=..50d38c5ed887bb78e876cc14ee84f36c1a8bbf01_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,7 @@ 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 @@ ) 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