RF: update cythexts / setup_helpers from regreg

Author: jonathan-taylor

Diff for: cythexts.py

@@ -1,7 +1,6 @@
 import os
 from os.path import splitext, sep as filesep, join as pjoin, relpath
 from hashlib import sha1
-from subprocess import check_call
 
 from distutils.command.build_ext import build_ext
 from distutils.command.sdist import sdist
@@ -95,6 +94,8 @@ def cyproc_exts(exts, cython_min_version,
         Can be ``build_ext`` input (if we have good c files) or cython
         ``build_ext`` if we have a good cython, or a class raising an informative
         error on ``run()``
+    need_cython : bool
+        True if we need Cython to build extensions, False otherwise.
     """
     if stamped_pyx_ok(exts, hash_stamps_fname):
         # Replace pyx with c files, use standard builder
@@ -107,29 +108,33 @@ def cyproc_exts(exts, cython_min_version,
                 else:
                     sources.append(source)
             mod.sources = sources
-        return build_ext
+        return build_ext, False
     # We need cython
     try:
         from Cython.Compiler.Version import version as cyversion
     except ImportError:
-        cython_ok = False
-    else:
-        cython_ok = LooseVersion(cyversion) >= cython_min_version
-    if cython_ok:
+        return derror_maker(build_ext,
+                            'Need cython>={0} to build extensions '
+                            'but cannot import "Cython"'.format(
+                            cython_min_version)), True
+    if LooseVersion(cyversion) >= cython_min_version:
         from Cython.Distutils import build_ext as extbuilder
-        return extbuilder
+        return extbuilder, True
     return derror_maker(build_ext,
-                        'Need cython>=%s to build extensions'
-                        % cython_min_version)
+                        'Need cython>={0} to build extensions'
+                        'but found cython version {1}'.format(
+                        cython_min_version, cyversion)), True
 
 
-def build_stamp(pyxes):
+def build_stamp(pyxes, include_dirs=()):
     """ Cythonize files in `pyxes`, return pyx, C filenames, hashes
 
     Parameters
     ----------
     pyxes : sequence
         sequence of filenames of files on which to run Cython
+    include_dirs : sequence
+        Any extra include directories in which to find Cython files.
 
     Returns
     -------
@@ -139,11 +144,17 @@ def build_stamp(pyxes):
         hash>; "c_filename", <c filemane>; "c_hash", <c file SHA1 hash>.
     """
     pyx_defs = {}
+    from Cython.Compiler.Main import compile
+    from Cython.Compiler.CmdLine import parse_command_line
+    includes = sum([['--include-dir', d] for d in include_dirs], [])
     for source in pyxes:
         base, ext = splitext(source)
         pyx_hash = sha1(open(source, 'rt').read()).hexdigest()
         c_filename = base + '.c'
-        check_call('cython ' + source, shell=True)
+        options, sources = parse_command_line(includes + [source])
+        result = compile(sources, options)
+        if result.num_errors > 0:
+            raise RuntimeError('Cython failed to compile ' + source)
         c_hash = sha1(open(c_filename, 'rt').read()).hexdigest()
         pyx_defs[source] = dict(pyx_hash=pyx_hash,
                                 c_filename=c_filename,
@@ -173,22 +184,19 @@ def write_stamps(pyx_defs, stamp_fname='pyx-stamps'):
                                            pyx_info['c_hash']))
 
 
-def find_pyx(root_dir=None):
+def find_pyx(root_dir):
     """ Recursively find files with extension '.pyx' starting at `root_dir`
 
     Parameters
     ----------
-    root_dir : None or str, optional
-        Directory from which to search for pyx files.  If None, use current
-        working directory.
+    root_dir : str
+        Directory from which to search for pyx files.
 
     Returns
     -------
     pyxes : list
         list of filenames relative to `root_dir`
     """
-    if root_dir is None:
-        root_dir = os.getcwd()
     pyxes = []
     for dirpath, dirnames, filenames in os.walk(root_dir):
         for filename in filenames:
@@ -199,7 +207,8 @@ def find_pyx(root_dir=None):
     return pyxes
 
 
-def get_pyx_sdist(sdist_like=sdist, hash_stamps_fname='pyx-stamps'):
+def get_pyx_sdist(sdist_like=sdist, hash_stamps_fname='pyx-stamps',
+                  include_dirs=()):
     """ Add pyx->c conversion, hash recording to sdist command `sdist_like`
 
     Parameters
@@ -210,6 +219,8 @@ def get_pyx_sdist(sdist_like=sdist, hash_stamps_fname='pyx-stamps'):
     hash_stamps_fname : str, optional
         filename to which to write hashes of pyx / py and c files.  Default is
         ``pyx-stamps``
+    include_dirs : sequence
+        Any extra include directories in which to find Cython files.
 
     Returns
     -------
@@ -240,7 +251,7 @@ def make_distribution(self):
                     base, ext = splitext(source)
                     if ext in ('.pyx', '.py'):
                         pyxes.append(source)
-            self.pyx_defs = build_stamp(pyxes)
+            self.pyx_defs = build_stamp(pyxes, include_dirs)
             for pyx_fname, pyx_info in self.pyx_defs.items():
                 self.filelist.append(pyx_info['c_filename'])
             sdist_like.make_distribution(self)
@@ -254,7 +265,8 @@ def make_release_tree(self, base_dir, files):
     return PyxSDist
 
 
-def build_stamp_source(root_dir=None, stamp_fname='pyx-stamps'):
+def build_stamp_source(root_dir=None, stamp_fname='pyx-stamps',
+                       include_dirs=None):
     """ Build cython c files, make stamp file in source tree `root_dir`
 
     Parameters
@@ -264,7 +276,13 @@ def build_stamp_source(root_dir=None, stamp_fname='pyx-stamps'):
         working directory.
     stamp_fname : str, optional
         Filename for stamp file we will write
+    include_dirs : None or sequence
+        Any extra Cython include directories
     """
+    if root_dir is None:
+        root_dir = os.getcwd()
+    if include_dirs is None:
+        include_dirs = [pjoin(root_dir, 'src')]
     pyxes = find_pyx(root_dir)
-    pyx_defs = build_stamp(pyxes)
+    pyx_defs = build_stamp(pyxes, include_dirs=include_dirs)
     write_stamps(pyx_defs, stamp_fname)