diff options
| author | Bob Ippolito <bob@redivi.com> | 2011-04-12 11:33:35 -0700 |
|---|---|---|
| committer | Bob Ippolito <bob@redivi.com> | 2011-04-12 11:33:35 -0700 |
| commit | b84a573407e8acb05cb3a973da65c4ae28bd3daa (patch) | |
| tree | 496e9ad86ecc7919b9298d839d0c20cb05ed0c1c | |
| parent | 5cad556f7d60a84eda51adca054c51a192c98c09 (diff) | |
| download | simplejson-b84a573407e8acb05cb3a973da65c4ae28bd3daa.tar.gz | |
do not try to build extension under PyPy
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | setup.py | 3 |
3 files changed, 4 insertions, 1 deletions
@@ -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 @@ -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 |