Merge branch 'release-0.1.5'

Mouse-Imaging-Centre · Oct 22, 2014 · db32f96 · db32f96
2 parents 83692b2 + d3cb045
commit db32f96
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+New in Version 0.1.5
+====================
+* fixes cython/numpy compilation issues with anaconda-2.1.0
+
 New in Version 0.1.4
 ====================
 * added rotational_minctracc.py 

diff --git a/setup.py b/setup.py
@@ -3,20 +3,20 @@
 from distutils.core import setup
 from distutils.extension import Extension
 from Cython.Distutils import build_ext
-
+import numpy
 
 setup(name="python-stuffs",
-      version='0.1.4',
-      scripts=["python/TFCE", 
-	       "python/smooth_vector", 
-	       "python/measure_xcorr", 
-               "python/pmincaverage", 
-               "python/minc_label_ops", 
-               "python/compute_values_across_segmentation", 
-               "python/volumes_from_labels_only", 
+      version='0.1.5',
+      scripts=["python/TFCE",
+               "python/smooth_vector",
+               "python/measure_xcorr",
+               "python/pmincaverage",
+               "python/minc_label_ops",
+               "python/compute_values_across_segmentation",
+               "python/volumes_from_labels_only",
                "python/voxel_vote",
                "python/replace_label_with_nearest_valid_label",
                "python/rotational_minctracc.py"],
       cmdclass = {'build_ext': build_ext},
-      ext_modules = [Extension("cython_functions", ["python/cython_functions.pyx"])]
+      ext_modules = [Extension("cython_functions", ["python/cython_functions.pyx"], include_dirs=[numpy.get_include()])]
       )