[yt-svn] commit/yt: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/ef281de033e5/
Changeset:   ef281de033e5
Branch:      yt
User:        ngoldbaum
Date:        2016-02-24 19:46:59+00:00
Summary:     Ensure cythonized sources are generated as part of the sdist
Affected #:  2 files

diff -r dda193582d6c210518df5d127cef1a7294dca692 -r ef281de033e5f660eb0e130d35cbde725d779412 setup.py
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@
 from setuptools import setup, find_packages
 from setuptools.extension import Extension
 from setuptools.command.build_ext import build_ext as _build_ext
+from setuptools.command.sdist import sdist as _sdist
 from setuptools.command.build_py import build_py as _build_py
 from setupext import \
     check_for_openmp, check_for_pyembree, read_embree_location, \
@@ -327,6 +328,16 @@
         import numpy
         self.include_dirs.append(numpy.get_include())
 
+class sdist(_sdist):
+    # subclass setuptools source distribution builder to ensure cython
+    # generated C files are included in source distribution.
+    # See http://stackoverflow.com/a/18418524/1382869
+    def run(self):
+        # Make sure the compiled Cython files in the distribution are up-to-date
+        from Cython.Build import cythonize
+        cythonize(cython_extensions)
+        _sdist.run(self)
+
 setup(
     name="yt",
     version=VERSION,
@@ -365,7 +376,7 @@
         'numpy',
         'IPython',
     ],
-    cmdclass={'build_ext': build_ext, 'build_py': build_py},
+    cmdclass={'sdist': sdist, 'build_ext': build_ext, 'build_py': build_py},
     author="The yt project",
     author_email="yt-dev at lists.spacepope.org",
     url="http://yt-project.org/",

diff -r dda193582d6c210518df5d127cef1a7294dca692 -r ef281de033e5f660eb0e130d35cbde725d779412 yt/geometry/particle_deposit.pyx
--- a/yt/geometry/particle_deposit.pyx
+++ b/yt/geometry/particle_deposit.pyx
@@ -20,7 +20,7 @@
 cimport cython
 from libc.math cimport sqrt
 from cpython cimport PyObject
-from fp_utils cimport *
+from yt.utilities.lib.fp_utils cimport *
 
 from oct_container cimport Oct, OctAllocationContainer, \
     OctreeContainer, OctInfo


https://bitbucket.org/yt_analysis/yt/commits/5cde4c82ad67/
Changeset:   5cde4c82ad67
Branch:      yt
User:        MatthewTurk
Date:        2016-03-02 17:30:48+00:00
Summary:     Merged in ngoldbaum/yt (pull request #2004)

Ensure cythonized sources are generated as part of the sdist
Affected #:  2 files

diff -r bf1389cb5d0995907a78e24adc00dd6b5788ec03 -r 5cde4c82ad67e298a3df60962bd0607fd274145f setup.py
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@
 from setuptools import setup, find_packages
 from setuptools.extension import Extension
 from setuptools.command.build_ext import build_ext as _build_ext
+from setuptools.command.sdist import sdist as _sdist
 from setuptools.command.build_py import build_py as _build_py
 from setupext import \
     check_for_openmp, check_for_pyembree, read_embree_location, \
@@ -327,6 +328,16 @@
         import numpy
         self.include_dirs.append(numpy.get_include())
 
+class sdist(_sdist):
+    # subclass setuptools source distribution builder to ensure cython
+    # generated C files are included in source distribution.
+    # See http://stackoverflow.com/a/18418524/1382869
+    def run(self):
+        # Make sure the compiled Cython files in the distribution are up-to-date
+        from Cython.Build import cythonize
+        cythonize(cython_extensions)
+        _sdist.run(self)
+
 setup(
     name="yt",
     version=VERSION,
@@ -365,7 +376,7 @@
         'numpy',
         'IPython',
     ],
-    cmdclass={'build_ext': build_ext, 'build_py': build_py},
+    cmdclass={'sdist': sdist, 'build_ext': build_ext, 'build_py': build_py},
     author="The yt project",
     author_email="yt-dev at lists.spacepope.org",
     url="http://yt-project.org/",

diff -r bf1389cb5d0995907a78e24adc00dd6b5788ec03 -r 5cde4c82ad67e298a3df60962bd0607fd274145f yt/geometry/particle_deposit.pyx
--- a/yt/geometry/particle_deposit.pyx
+++ b/yt/geometry/particle_deposit.pyx
@@ -20,7 +20,7 @@
 cimport cython
 from libc.math cimport sqrt
 from cpython cimport PyObject
-from fp_utils cimport *
+from yt.utilities.lib.fp_utils cimport *
 
 from oct_container cimport Oct, OctAllocationContainer, \
     OctreeContainer, OctInfo

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.