Merge branch 'parcel-buffer' into integration

matthew-brett · matthew-brett · commit 60d7f145fa6f · 2018-01-15T15:45:03.000Z
* parcel-buffer:
  RF+BF: work round Windows not having longcomplex
  BF: use safe Python 2 / 3 check for number
  BF: fix various Windows errors
diff --git a/nipy/algorithms/group/parcel_analysis.py b/nipy/algorithms/group/parcel_analysis.py
@@ -251,7 +251,7 @@ def __init__(self, con_imgs, parcel_img, parcel_info=None,
         # load the parcellation and resample it at the appropriate
         # resolution
         self.reference = parcel_img.reference
-        self.parcel_full_res = parcel_img.get_data().astype('uint').squeeze()
+        self.parcel_full_res = parcel_img.get_data().astype('uintp').squeeze()
         self.affine_full_res = xyz_affine(parcel_img)
         parcel_img = make_xyz_image(self.parcel_full_res,
                                     self.affine_full_res,
@@ -261,7 +261,7 @@ def __init__(self, con_imgs, parcel_img, parcel_info=None,
                                   reference=(self.con_imgs[0].shape,
                                              self.affine),
                                   interp_order=0)
-        self.parcel = parcel_img_rsp.get_data().astype('uint').squeeze()
+        self.parcel = parcel_img_rsp.get_data().astype('uintp').squeeze()
         if self.msk is None:
             self.msk = self.parcel > 0
 
diff --git a/nipy/algorithms/registration/histogram_registration.py b/nipy/algorithms/registration/histogram_registration.py
@@ -19,7 +19,7 @@
 from .similarity_measures import similarity_measures as _sms
 from ._registration import _joint_histogram
 
-MAX_INT = np.iinfo(np.intp).max
+MAX_INT = np.iinfo(np.int).max
 
 # Module globals
 VERBOSE = True  # enables online print statements
diff --git a/nipy/algorithms/segmentation/tests/test_segmentation.py b/nipy/algorithms/segmentation/tests/test_segmentation.py
@@ -2,6 +2,8 @@
 """
 from __future__ import absolute_import
 
+from numbers import Number
+
 import numpy as np
 
 from nose.tools import assert_equal, assert_almost_equal
@@ -20,8 +22,8 @@
 
 
 def _check_dims(x, ndim, shape):
-    if isinstance(shape, int):
-        shape = (shape, )
+    if isinstance(shape, Number):
+        shape = (shape,)
     for i in range(ndim):
         assert_equal(x.shape[i], shape[i])
 
diff --git a/nipy/core/reference/tests/test_coordinate_map.py b/nipy/core/reference/tests/test_coordinate_map.py
@@ -31,7 +31,8 @@
                       [np.object])
 # Sympy <= 1.1 does not handle numpy longcomplex correctly. See:
 # https://github.com/sympy/sympy/pull/12901
-_SYMPY_SAFE_DTYPES.remove(np.longcomplex)
+if np.longcomplex in _SYMPY_SAFE_DTYPES:  # Not present for Windows
+    _SYMPY_SAFE_DTYPES.remove(np.longcomplex)
 
 
 class empty(object):
