Merge pull request #77 from kngwyu/py2

Python2 support

Author: kngwyu

.travis.yml

@@ -9,8 +9,14 @@ cache:
 
 matrix:
   include:
-  - python: "3.5"
-  - python: "3.6"
+    - python: "2.7"
+      env: FEATURES=python2
+    - python: "3.5"
+      env: FEATURES=python3
+    - python: "3.6"
+      env: FEATURES=python3
+    - python: "3.7-dev"
+      env: FEATURES=python3
 
 env:
   global:

Cargo.toml

@@ -16,3 +16,12 @@ num-complex = "0.2"
 num-traits = "0.2.6"
 ndarray = "0.12"
 pyo3 = "0.5.0-alpha.2"
+
+[features]
+# In default setting, python version is automatically detected
+default = []
+# Use this feature when building python2 binding.
+python2 = ["pyo3/python2"]
+# Use this feature when building python3 binding.
+python3 = ["pyo3/python3"]
+

README.md

@@ -26,6 +26,23 @@ https://github.com/PyO3/pyo3/blob/master/build.rs for minimum required version)
 Starting from 0.3, rust-numpy migrated from rust-cpython to pyo3.
 If you want to use rust-cpython, use version 0.2.1 from crates.io.
 
+Supported python version
+-------------
+Currently 2.7, 3.5, 3.6, 3.7 are supported.
+
+By default, python version is automatically by execute `python`.
+
+If you need to use python version, please add a feature flag like
+
+``` toml
+[dependencies.numpy]
+version = "0.4.0-alpha.1"
+features = ["python3"]
+```
+.
+
+You can also specify version in [setup.py](examples/simple-extension/setup.py)
+
 
 Example
 ---------

appveyor.yml

@@ -1,8 +1,12 @@
 environment:
   TARGET: x86_64-pc-windows-msvc
   matrix:
+    - PYTHON: "C:/Python27-x64"
+      FEATURES: python2
     - PYTHON: "C:/Python35-x64"
+      FEATURES: python3
     - PYTHON: "C:/Python36-x64"
+      FEATURES: python3
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
@@ -17,10 +21,9 @@ install:
   - pip install setuptools-rust pytest pytest-benchmark tox numpy
 
 build_script:
-  - cargo build --verbose
+  - cargo build --verbose --features %FEATURES%
 
 test_script:
-  - cargo build --verbose --all
-  - cargo test --verbose --all
+  - cargo test --verbose --features %FEATURES%
   - rustdoc --test README.md -L native="%PYTHON%\\libs" -L target/debug/deps/
   - cd examples/simple-extension && python setup.py install && python setup.py test

build.rs

@@ -0,0 +1,33 @@
+use std::process::{Command, Stdio};
+use std::str;
+fn is_python2() -> bool {
+    let script = r"
+import sys
+print(sys.version_info[0])
+";
+    let out = Command::new("python")
+        .args(&["-c", script])
+        .stderr(Stdio::inherit())
+        .output()
+        .expect("Failed to run the python interpreter");
+    let version = str::from_utf8(&out.stdout).unwrap();
+    version.starts_with("2")
+}
+
+fn cfg(python2: bool) {
+    if python2 {
+        println!("cargo:rustc-cfg=Py_2");
+    } else {
+        println!("cargo:rustc-cfg=Py_3");
+    }
+}
+
+fn main() {
+    if cfg!(feature = "python3") {
+        cfg(false);
+    } else if cfg!(feature = "python2") {
+        cfg(true);
+    } else {
+        cfg(is_python2());
+    }
+}

ci/travis/test.sh

@@ -2,8 +2,8 @@
 
 set -ex
 
-cargo build --verbose --all
-cargo test --verbose --all
+cargo build --verbose --features $FEATURES
+cargo test --verbose --features $FEATURES
 rustdoc -L target/debug/deps/ --test README.md
 
 for example in examples/*; do

examples/simple-extension/setup.py

@@ -14,6 +14,20 @@ def run(self):
         raise SystemExit(errno)
 
 
+def get_cfg_flags():
+    version = sys.version_info[0:2]
+    if version[0] == 2:
+        return ['--cfg=Py_2']
+    else:
+        return ['--cfg=Py_3']
+
+def get_features():
+    version = sys.version_info[0:2]
+    if version[0] == 2:
+        return ['numpy/python2']
+    else:
+        return ['numpy/python3']
+
 setup_requires = ['setuptools-rust>=0.6.0']
 install_requires = ['numpy']
 test_requires = install_requires + ['pytest']
@@ -22,7 +36,12 @@ def run(self):
     name='rust_ext',
     version='0.1.0',
     description='Example of python-extension using rust-numpy',
-    rust_extensions=[RustExtension('rust_ext.rust_ext', './Cargo.toml')],
+    rust_extensions=[RustExtension(
+        'rust_ext.rust_ext',
+        './Cargo.toml',
+        rustc_flags=get_cfg_flags(),
+        features=get_features(),
+    )],
     install_requires=install_requires,
     setup_requires=setup_requires,
     test_requires=test_requires,

examples/simple-extension/tests/test_ext.py

@@ -7,8 +7,8 @@ def test_axpy():
     y = np.array([3.0, 3.0, 3.0])
     z = axpy(3.0, x, y)
     np.testing.assert_array_almost_equal(z, np.array([6.0, 9.0, 12.0]))
-    x = np.array([*x, 4.0])
-    y = np.array([*y, 3.0])
+    x = np.array([1.0, 2.0, 3.0, 4.0])
+    y = np.array([3.0, 3.0, 3.0, 3.0])
     z = axpy(3.0, x, y)
     np.testing.assert_array_almost_equal(z, np.array([6.0, 9.0, 12.0, 15.0]))
 

examples/simple-extension/tox.ini

@@ -1,5 +1,6 @@
 [tox]
-envlist = py35,
+envlist = py27,
+          py35,
           py36,
           py37,
 minversion = 2.9.0

src/npyffi/mod.rs

@@ -12,11 +12,19 @@
 use pyo3::ffi;
 use std::ffi::CString;
 use std::os::raw::c_void;
-use std::ptr::null_mut;
 
 fn get_numpy_api(module: &str, capsule: &str) -> *const *const c_void {
     let module = CString::new(module).unwrap();
     let capsule = CString::new(capsule).unwrap();
+    #[cfg(not(Py_3))]
+    unsafe fn get_capsule(capsule: *mut ffi::PyObject) -> *const *const c_void {
+        ffi::PyCObject_AsVoidPtr(capsule) as *const *const c_void
+    }
+    #[cfg(Py_3)]
+    unsafe fn get_capsule(capsule: *mut ffi::PyObject) -> *const *const c_void {
+        use std::ptr::null_mut;
+        ffi::PyCapsule_GetPointer(capsule, null_mut()) as *const *const c_void
+    }
     unsafe {
         assert_ne!(
             ffi::Py_IsInitialized(),
@@ -27,7 +35,8 @@ Please make sure that you get gil, by `let gil = Python::acquire_gil();`"
         let numpy = ffi::PyImport_ImportModule(module.as_ptr());
         assert!(!numpy.is_null(), "Failed to import numpy module");
         let capsule = ffi::PyObject_GetAttrString(numpy as *mut ffi::PyObject, capsule.as_ptr());
-        ffi::PyCapsule_GetPointer(capsule, null_mut()) as *const *const c_void
+        assert!(!capsule.is_null(), "Failed to import numpy module");
+        get_capsule(capsule)
     }
 }