Enable C extensions on pypy and add pypy3 support

sontek · aholmberg · commit f7c0bd312df6 · 2015-07-15T11:09:19.000-05:00
Conflicts:
	tox.ini
diff --git a/cassandra/murmur3.c b/cassandra/murmur3.c
@@ -20,6 +20,13 @@ typedef int Py_ssize_t;
 #define PY_SSIZE_T_MIN INT_MIN
 #endif
 
+#ifdef PYPY_VERSION
+#define COMPILING_IN_PYPY 1
+#define COMPILING_IN_CPYTHON 0
+#else
+#define COMPILING_IN_PYPY 0
+#define COMPILING_IN_CPYTHON 1
+#endif
 //-----------------------------------------------------------------------------
 // Platform-specific functions and macros
 
@@ -179,7 +186,8 @@ struct module_state {
     PyObject *error;
 };
 
-#if PY_MAJOR_VERSION >= 3
+// pypy3 doesn't have GetState yet.
+#if COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
 #define GETSTATE(m) ((struct module_state*)PyModule_GetState(m))
 #else
 #define GETSTATE(m) (&_state)
diff --git a/setup.py b/setup.py
@@ -235,6 +235,7 @@ def run_setup(extensions):
         **kw)
 
 is_windows = os.name == 'nt'
+
 if is_windows:
     build_extensions.error_message = """
 ===============================================================================
@@ -291,8 +292,7 @@ def run_setup(extensions):
 
 if extensions:
     if (sys.platform.startswith("java")
-            or sys.platform == "cli"
-            or "PyPy" in sys.version):
+        or sys.platform == "cli"):
         sys.stderr.write(platform_unsupported_msg)
         extensions = ()
     elif sys.byteorder == "big":
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{26,27,33,34},pypy
+envlist = py{26,27,33,34},pypy,pypy3
 
 [base]
 deps = nose
@@ -20,6 +20,13 @@ commands = nosetests --verbosity=2 --no-path-adjustment {toxinidir}/tests/unit/
 
 [testenv:pypy]
 deps = {[base]deps}
-commands = nosetests --verbosity=2 {toxinidir}/tests/unit/
+commands = {envpython} setup.py build_ext --inplace
+           nosetests --verbosity=2 tests/unit/
+
+[testenv:pypy3]
+deps = {[base]deps}
+commands = {envpython} setup.py build_ext --inplace
+           nosetests --verbosity=2 tests/unit/
+
 # cqlengine/test_timestamp.py uses sure, which fails in pypy presently
 # could remove sure usage
