numpy assert_all_close no longer works with ImageArrays so use np.allclose instead

Author: tboggs

spectral/tests/dimensionality.py

@@ -55,7 +55,7 @@ def test_mnf_all_equals_data(self):
         noise = spy.noise_from_diffs(data[117: 137, 85: 122, :])
         mnfr = spy.mnf(signal, noise)
         denoised = mnfr.denoise(data, num=data.shape[-1])
-        assert_allclose(denoised, data)
+        assert(np.allclose(denoised, data))
 
     def test_ppi(self):
         '''Tests that ppi function runs'''
@@ -75,7 +75,7 @@ def test_ppi_continues(self):
         np.random.set_state(s)
         p2 = spy.ppi(data, 2)
         p2 = spy.ppi(data, 2, start=p2)
-        np.all(p == p2)
+        assert(np.all(p == p2))
 
     def test_ppi_centered(self):
         '''Tests that ppi with mean-subtracted data works as expected.'''
@@ -86,7 +86,7 @@ def test_ppi_centered(self):
         np.random.set_state(s)
         data_centered = data - spy.calc_stats(data).mean
         p2 = spy.ppi(data_centered, 4)
-        np.all(p == p2)
+        assert(np.all(p == p2))
 
     def test_pca_runs(self):
         '''Should be able to compute PCs and transform data.'''

spectral/tests/spyfile.py

@@ -44,9 +44,11 @@
 from __future__ import division, print_function, unicode_literals
 
 import numpy as np
-from numpy.testing import assert_almost_equal
 from .spytest import SpyTest
 
+def assert_almost_equal(a, b, **kwargs):
+    if not np.allclose(a, b, **kwargs):
+        raise Exception('NOPE')
 
 class SpyFileTest(SpyTest):
     '''Tests that SpyFile methods read data correctly from files.'''
@@ -165,7 +167,7 @@ def test_load(self):
         data = self.image.load()
         spyf = self.image
 
-        load_assert = assert_same_shape_almost_equal
+        load_assert = np.allclose
         load_assert(data[i, j, k], self.value)
         first_band = spyf[:, :, 0]
         load_assert(data[:, :, 0], first_band)