From 96abe4fcec0f637060d8d0e53ce11025e0a5d033 Mon Sep 17 00:00:00 2001
From: Matthijs van Eede <matthijsvaneede@gmail.com>
Date: Wed, 22 Oct 2014 16:16:21 -0400
Subject: [PATCH 1/2] changes to the setup.py in order to compile minc-stuffs
 using anaconda-2.1.0 (cython/numpy related issues) fixes #6 Thanks Gabriel!

---
 setup.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 049639c..f255a9a 100644
--- 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", 
+      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()])]
       )

From d3cb045be4ddec2eac746474500ca4bc22740fd9 Mon Sep 17 00:00:00 2001
From: Matthijs van Eede <matthijsvaneede@gmail.com>
Date: Wed, 22 Oct 2014 16:18:59 -0400
Subject: [PATCH 2/2] updated version (0.1.5) and NEWS

---
 NEWS     | 4 ++++
 setup.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1a326a6..63a341c 100644
--- 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
index f255a9a..f6d1969 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 import numpy
 
 setup(name="python-stuffs",
-      version='0.1.4',
+      version='0.1.5',
       scripts=["python/TFCE",
                "python/smooth_vector",
                "python/measure_xcorr",