add pyo3 support

Author: fafhrd91

CHANGES.rst

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+0.6.0 (2017-05-14)
+------------------
+
+- Add support for PyO3 project https://github.com/PyO3/PyO3
+
+
 0.5.1 (2017-05-03)
 ------------------
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-version = '0.5.1'
+version = '0.6.0'
 
 
 setup(

setuptools_rust/build.py

@@ -52,7 +52,6 @@ def build_extension(self, ext):
             # disables rust's pkg-config seeking for specified packages,
             # which causes pythonXX-sys to fall back to detecting the
             # interpreter from the path.
-            "PYTHON_2.7_NO_PKG_CONFIG": "1",
             "PATH":  bindir + os.pathsep + os.environ.get("PATH", "")
         })
 
@@ -61,7 +60,7 @@ def build_extension(self, ext):
                 "Can not file rust extension project file: %s" % ext.path)
 
         features = set(ext.features)
-        features.update(cpython_feature())
+        features.update(cpython_feature(pyo3=ext.pyo3))
 
         if ext.debug is None:
             debug_build = self.inplace
@@ -107,7 +106,8 @@ def build_extension(self, ext):
         if not quiet:
             if isinstance(output, bytes):
                 output = output.decode('latin-1')
-                print(output, file=sys.stderr)
+                if output:
+                    print(output, file=sys.stderr)
 
         # Find the shared library that cargo hopefully produced and copy
         # it into the build directory as if it were produced by build_ext.

setuptools_rust/check.py

@@ -55,7 +55,7 @@ def run(self):
                     "Can not file rust extension project file: %s" % ext.path)
 
             features = set(ext.features)
-            features.update(cpython_feature())
+            features.update(cpython_feature(pyo3=ext.pyo3))
 
             # build cargo command
             args = (["cargo", "check", "--lib", "--manifest-path", ext.path,

setuptools_rust/extension.py

@@ -28,13 +28,17 @@ class RustExtension:
         Controls whether --debug or --release is passed to cargo. If set to
         None then build type is auto-detect. Inplace build is debug build
         otherwise release. Default: None
+      pyo3 : bool
+        Controls wich python binding is in use. `pyo3=True` uses PyO3 binding,
+        `pyo3=False` uses rust-cpython binding,
     """
 
     def __init__(self, name, path,
                  args=None, features=None, rust_version=None,
-                 quiet=False, debug=None):
+                 quiet=False, debug=None, pyo3=False):
         self.name = name
         self.args = args
+        self.pyo3 = pyo3
         self.rust_version = rust_version
         self.quiet = quiet
         self.debug = debug

setuptools_rust/test.py

@@ -57,11 +57,11 @@ def run(self):
                     "Can not file rust extension project file: %s" % ext.path)
 
             features = set(ext.features)
-            features.update(cpython_feature(ext=False))
+            features.update(cpython_feature(ext=False, pyo3=ext.pyo3))
 
             # build cargo command
-            args = (["cargo", "test", "--manifest-path", ext.path,
-                     "--features", " ".join(features)]
+            args = (["cargo", "test", '--color', 'always', "--manifest-path",
+                     ext.path, "--features", " ".join(features)]
                     + list(ext.args or []))
 
             # Execute cargo command

setuptools_rust/utils.py

@@ -6,21 +6,28 @@
 import semantic_version
 
 
-def cpython_feature(ext=True):
+def cpython_feature(ext=True, pyo3=False):
     version = sys.version_info
-    if (2, 7) < version < (2, 8):
-        if ext:
-            return ("cpython/python27-sys", "cpython/extension-module-2-7")
-        else:
-            return ("cpython/python27-sys",)
-    elif (3, 3) < version:
+
+    if pyo3:
         if ext:
-            return ("cpython/python3-sys", "cpython/extension-module")
+            return ("pyo3/extension-module",)
         else:
-            return ("cpython/python3-sys",)
+            return ()
     else:
-        raise DistutilsPlatformError(
-            "Unsupported python version: %s" % sys.version)
+        if (2, 7) < version < (2, 8):
+            if ext:
+                return ("cpython/python27-sys", "cpython/extension-module-2-7")
+            else:
+                return ("cpython/python27-sys",)
+        elif (3, 3) < version:
+            if ext:
+                return ("cpython/python3-sys", "cpython/extension-module")
+            else:
+                return ("cpython/python3-sys",)
+
+    raise DistutilsPlatformError(
+        "Unsupported python version: %s" % sys.version)
 
 
 def get_rust_version():