use different semver lib; added readme info about RustExtension

Author: fafhrd91

CHANGES.rst

@@ -8,6 +8,8 @@ CHANGES
 
 - Add rust version check for extension.
 
+- Cleanup example project
+
 
 0.2 (2017-03-08)
 ----------------

README.rst

@@ -50,6 +50,29 @@ Or you can use commands like `bdist_wheel` or `bdist_egg`
 RustExtension
 -------------
 
+You can define rust extension with `RustExtension` class.
+
+.. class:: RustExtension(name, path, args=None, features=None, rust_version=None, \
+                         quiet=False, debug=False)
+
+   The class for creating rust extensions.
+
+   :param str name: the full name of the extension, including any packages -- ie.
+                    *not* a filename or pathname, but Python dotted name
+
+   :param str path: path to the Cargo.toml manifest file
+
+   :param [str] args: a list of extra argumenents to be passed to cargo.
+
+   :param [str] features: a list of features to also build
+
+   :param str rust_version: sematic version of rust compiler version -- for example
+                            *>1.14,<1.16*, default is None
+
+   :param bool quiet: Does not echo cargo's output. default is False
+
+   :param bool debug: Controls whether --debug or --release is passed to cargo.
+
 
 
 

example/extensions/Cargo.toml

@@ -9,4 +9,4 @@ default-features = false
 
 [lib]
 name = "helloworld"
-crate-type = ["dylib"]
+crate-type = ["cdylib"]

example/extensions/src/lib.rs

@@ -4,7 +4,7 @@
 
 use cpython::{PyObject, PyResult, Python, PyTuple, PyDict};
 
-py_module_initializer!(_helloworld, init_helloworld, PyInit_helloworld, |py, m| {
+py_module_initializer!(_helloworld, init_helloworld, PyInit__helloworld, |py, m| {
     try!(m.add(py, "__doc__", "Module documentation string"));
     try!(m.add(py, "run", py_fn!(py, run(*args, **kwargs))));
     try!(m.add(py, "val", py_fn!(py, val())));

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-version = '0.2'
+version = '0.3'
 
 
 setup(
@@ -15,7 +15,7 @@
         (open('README.rst').read(), open('CHANGES.rst').read())),
     license='MIT',
     packages=['setuptools_rust'],
-    install_requires=['semver==2.7.6'],
+    install_requires=['semantic_version==2.6.0'],
     zip_safe=True,
     classifiers=[
         "Topic :: Software Development :: Version Control",

setuptools_rust/__init__.py

@@ -6,10 +6,10 @@
 import subprocess
 from distutils.cmd import Command
 from distutils.errors import (
-    CompileError,
-    DistutilsExecError, DistutilsFileError, DistutilsPlatformError)
+    CompileError, DistutilsExecError, DistutilsFileError,
+    DistutilsPlatformError, DistutilsSetupError)
 
-import semver
+import semantic_version
 
 from . import patch  # noqa
 
@@ -25,7 +25,7 @@ class RustExtension:
         the full name of the extension, including any packages -- ie.
         *not* a filename or pathname, but Python dotted name
       path : string
-        path to the cargo.toml manifest
+        path to the cargo.toml manifest file
       args : [string]
         a list of extra argumenents to be passed to cargo.
       features : [string]
@@ -53,26 +53,31 @@ def __init__(self, name, path,
 
         self.features = [s.strip() for s in features]
 
-    @staticmethod
-    def get_rust_version():
-        env = os.environ.copy()
-        try:
-            output = subprocess.check_output(["rustc", "-V"], env=env)
-            return output.split(' ')[1]
-        except subprocess.CalledProcessError:
-            return None
-        except OSError:
+    def get_rust_version(self):
+        if self.rust_version is None:
             return None
+        try:
+            return semantic_version.Spec(self.rust_version)
+        except:
+            raise DistutilsSetupError(
+                'Can not parse rust compiler version: %s', self.rust_version)
 
 
-class build_rust(Command):
-    """
-    Command for building rust crates via cargo.
+def get_rust_version():
+    try:
+        output = subprocess.check_output(["rustc", "-V"])
+        if isinstance(output, bytes):
+            output = output.decode('latin-1')
+        return semantic_version.Version(output.split(' ')[1], partial=True)
+    except (subprocess.CalledProcessError, OSError):
+        raise DistutilsPlatformError('Can not find Rust compiler')
+    except Exception as exc:
+        raise DistutilsPlatformError(
+            'Can not get rustc version: %s' % str(exc))
 
-    Don't use this directly; use the build_rust_cmdclass
-    factory method.
-    """
-    description = "build rust crates into Python extensions"
+
+class build_rust(Command):
+    """ Command for building rust crates via cargo. """
 
     user_options = [
         ('inplace', 'i',
@@ -140,7 +145,7 @@ def build_extension(self, ext):
             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_cext.
+        # it into the build directory as if it were produced by build_ext.
         if ext.debug:
             suffix = "debug"
         else:
@@ -179,15 +184,16 @@ def build_extension(self, ext):
         shutil.copyfile(dylib_path, ext_path)
 
     def run(self):
-        version = RustExtension.get_rust_version()
-        if self.extensions and version is None:
-            raise DistutilsPlatformError('Can not find Rust compiler')
+        if not self.extensions:
+            return
+
+        version = get_rust_version()
 
         for ext in self.extensions:
-            if ext.rust_version is not None:
-                if not semver.match(version, ext.rust_version):
-                    raise DistutilsPlatformError(
-                        "Rust %s does not match extension requirenment %s" % (
-                            version, ext.rust_version))
+            rust_version = ext.get_rust_version()
+            if rust_version is not None and version not in rust_version:
+                raise DistutilsPlatformError(
+                    "Rust %s does not match extension requirenment %s" % (
+                        version, ext.rust_version))
 
             self.build_extension(ext)