fixed build command; use PyO3 in example

Author: fafhrd91

.gitignore

@@ -8,6 +8,6 @@
 Cargo.lock
 /example/build/
 /example/dist/
-/example/extensions/target/
+/example/target/
 /example/*.egg-info
 .idea/

CHANGES.rst

@@ -6,6 +6,8 @@ CHANGES
 
 - Add support for PyO3 project https://github.com/PyO3/PyO3
 
+- Add support for no-binding mode
+
 
 0.5.1 (2017-05-03)
 ------------------

README.rst

@@ -74,6 +74,10 @@ You can define rust extension with `RustExtension` class:
                       None then build type is auto-detect. Inplace build is debug build
                       otherwise release. Default: None
 
+   :param int binding: Controls which python binding is in use.
+                       `Binding.PyO3` uses PyO3
+                       `Binding.RustCPython` uses rust-cpython
+                       `Binding.NoBinding` uses no binding.
 
 Commands
 --------

example/extensions/Cargo.toml renamed to example/Cargo.toml

@@ -3,8 +3,8 @@ name = "hello-world"
 version = "0.1.0"
 authors = ["Nikolay Kim <[email protected]>"]
 
-[dependencies.cpython]
-git = "https://github.com/dgrunwald/rust-cpython.git"
+[dependencies.pyo3]
+git = "https://github.com/PyO3/PyO3.git"
 default-features = false
 
 [lib]

example/extensions/src/lib.rs

@@ -5,7 +5,7 @@
 setup(name='hello-rust',
       version='1.0',
       rust_extensions=[
-          RustExtension('hello_rust._helloworld', 'extensions/Cargo.toml')],
+          RustExtension('hello_rust._helloworld', 'Cargo.toml')],
       packages=['hello_rust'],
       # rust extensions are not zip safe, just like C-extensions.
       zip_safe=False)

example/setup.py

@@ -0,0 +1,35 @@
+#![feature(proc_macro)]
+
+extern crate pyo3;
+
+use pyo3::*;
+
+#[py::modinit(_helloworld)]
+fn init(py: Python, m: &PyModule) -> PyResult<()> {
+    m.add(py, "__doc__", "Module documentation string")?;
+
+    #[pyfn(m, "run", "*args, **kwargs")]
+    fn run_fn(py: Python, args: &PyTuple, kwargs: Option<&PyDict>) -> PyResult<()> {
+        run(py, args, kwargs)
+    }
+
+    #[pyfn(m, "val")]
+    fn val(_py: Python) -> PyResult<i32> {
+        Ok(42)
+    }
+
+    Ok(())
+}
+
+fn run(py: Python, args: &PyTuple, kwargs: Option<&PyDict>) -> PyResult<()> {
+    println!("Rust says: Hello Python!");
+    for arg in args.iter(py) {
+        println!("Rust got {}", arg);
+    }
+    if let Some(kwargs) = kwargs {
+        for (key, val) in kwargs.items(py) {
+            println!("{} = {}", key, val);
+        }
+    }
+    Ok(())
+}

example/src/lib.rs

@@ -74,7 +74,7 @@ def build_extension(self, ext):
         quiet = self.qbuild or ext.quiet
 
         # build cargo command
-        feature_args = ["--features " + " ".join(features)] if features else []
+        feature_args = ["--features", " ".join(features)] if features else []
         args = (["cargo", "rustc", "--lib", "--manifest-path", ext.path]
                 + feature_args
                 + list(ext.args or []))

setuptools_rust/build.py

@@ -57,9 +57,9 @@ def run(self):
             features = set(ext.features)
             features.update(cpython_feature(binding=ext.binding))
 
-            # build cargo command
-            feature_args = ["--features" + " ".join(features)] if features else []
-            args = (["cargo", "rustc", "--lib", "--manifest-path", ext.path]
+            # check cargo command
+            feature_args = ["--features", " ".join(features)] if features else []
+            args = (["cargo", "check", "--lib", "--manifest-path", ext.path]
                     + feature_args
                     + list(ext.args or []))
 

setuptools_rust/check.py

@@ -59,9 +59,9 @@ def run(self):
             features = set(ext.features)
             features.update(cpython_feature(ext=False, binding=ext.binding))
 
-            # build cargo command
-            feature_args = ["--features " + " ".join(features)] if features else []
-            args = (["cargo", "rustc", "--lib", "--manifest-path", ext.path]
+            # test cargo command
+            feature_args = ["--features", " ".join(features)] if features else []
+            args = (["cargo", "test", "--lib", "--manifest-path", ext.path]
                     + feature_args
                     + list(ext.args or []))