Merge branch 'release-0.1.6'

Mouse-Imaging-Centre · Nov 3, 2014 · f771453 · f771453
2 parents db32f96 + d33a8b7
commit f771453
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+New in Version 0.1.6
+====================
+* fixes egg-info file issues. The minc-stuffs version information will be produced correctly now
+
 New in Version 0.1.5
 ====================
 * fixes cython/numpy compilation issues with anaconda-2.1.0

diff --git a/setup.py b/setup.py
@@ -1,12 +1,19 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 from distutils.extension import Extension
 from Cython.Distutils import build_ext
 import numpy
 
+# setuptools DWIM monkey-patch madness
+# http://mail.python.org/pipermail/distutils-sig/2007-September/thread.html#8204
+import sys
+if 'setuptools.extension' in sys.modules:
+    m = sys.modules['setuptools.extension']
+    m.Extension.__dict__ = m._Extension.__dict__
+
 setup(name="python-stuffs",
-      version='0.1.5',
+      version='0.1.6',
       scripts=["python/TFCE",
                "python/smooth_vector",
                "python/measure_xcorr",