Merge pull request #490 from minrk/deprecated-testing-import

update deprecated import of assert_array_equal

Author: minrk

ipyparallel/tests/test_serialize.py

@@ -80,7 +80,7 @@ def test_roundtrip_memoryview():
 
 def test_numpy():
     pytest.importorskip('numpy')
-    from numpy.testing.utils import assert_array_equal
+    from numpy.testing import assert_array_equal
 
     for shape in SHAPES:
         for dtype in DTYPES:
@@ -96,7 +96,7 @@ def test_numpy():
 
 def test_recarray():
     pytest.importorskip('numpy')
-    from numpy.testing.utils import assert_array_equal
+    from numpy.testing import assert_array_equal
 
     for shape in SHAPES:
         for dtype in [
@@ -115,7 +115,7 @@ def test_recarray():
 
 def test_numpy_in_seq():
     pytest.importorskip('numpy')
-    from numpy.testing.utils import assert_array_equal
+    from numpy.testing import assert_array_equal
 
     for shape in SHAPES:
         for dtype in DTYPES:
@@ -133,7 +133,7 @@ def test_numpy_in_seq():
 
 def test_numpy_in_dict():
     pytest.importorskip('numpy')
-    from numpy.testing.utils import assert_array_equal
+    from numpy.testing import assert_array_equal
 
     for shape in SHAPES:
         for dtype in DTYPES:
@@ -226,7 +226,7 @@ class D(C):
 
 def test_pickle_threshold():
     numpy = pytest.importorskip('numpy')
-    from numpy.testing.utils import assert_array_equal
+    from numpy.testing import assert_array_equal
 
     A = numpy.ones((5, 5))
     bufs = serialize_object(A, 1024)

ipyparallel/tests/test_view.py

@@ -230,7 +230,7 @@ def test_scatter_gather(self):
     @skip_without('numpy')
     def test_scatter_gather_numpy(self):
         import numpy
-        from numpy.testing.utils import assert_array_equal
+        from numpy.testing import assert_array_equal
 
         view = self.client[:]
         a = numpy.arange(64)
@@ -250,7 +250,7 @@ def test_scatter_gather_lazy(self):
     def test_apply_numpy(self):
         """view.apply(f, ndarray)"""
         import numpy
-        from numpy.testing.utils import assert_array_equal
+        from numpy.testing import assert_array_equal
 
         A = numpy.random.random((100, 100))
         view = self.client[-1]
@@ -263,7 +263,7 @@ def test_apply_numpy(self):
     def test_apply_numpy_object_dtype(self):
         """view.apply(f, ndarray) with dtype=object"""
         import numpy
-        from numpy.testing.utils import assert_array_equal
+        from numpy.testing import assert_array_equal
 
         view = self.client[-1]
 
@@ -279,7 +279,7 @@ def test_apply_numpy_object_dtype(self):
     def test_push_pull_recarray(self):
         """push/pull recarrays"""
         import numpy
-        from numpy.testing.utils import assert_array_equal
+        from numpy.testing import assert_array_equal
 
         view = self.client[-1]
 
@@ -348,7 +348,7 @@ def test_map_iterable(self):
     def test_map_numpy(self):
         """test map on numpy arrays (direct)"""
         import numpy
-        from numpy.testing.utils import assert_array_equal
+        from numpy.testing import assert_array_equal
 
         view = self.client[:]
         # 101 is prime, so it won't be evenly distributed
@@ -366,7 +366,7 @@ def test_scatter_gather_nonblocking(self):
     @skip_without('numpy')
     def test_scatter_gather_numpy_nonblocking(self):
         import numpy
-        from numpy.testing.utils import assert_array_equal
+        from numpy.testing import assert_array_equal
 
         a = numpy.arange(64)
         view = self.client[:]