Merge pull request scipy#5579 from ev-br/axis_kwd

TST: skip tests of linalg.norm axis keyword on numpy <= 1.7.x
yorickjh · Dec 8, 2015 · 78f8ec3 · 78f8ec3
2 parents 9d633c9 + 15750b3
commit 78f8ec3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scipy/linalg/tests/test_basic.py b/scipy/linalg/tests/test_basic.py
@@ -1151,7 +1151,7 @@ def test_zero_norm(self):
         assert_equal(norm([1,0,3], 0), 2)
         assert_equal(norm([1,2,3], 0), 3)
 
-    @dec.skipif(NumpyVersion(np.__version__) < '1.7.0')
+    @dec.skipif(NumpyVersion(np.__version__) < '1.8.0')
     def test_axis_kwd(self):
         a = np.array([[[2, 1], [3, 4]]] * 2, 'd')
         assert_allclose(norm(a, axis=1), [[3.60555128, 4.12310563]] * 2)
@@ -1188,7 +1188,7 @@ def test_matrix_norms(self):
                         desired = np.linalg.norm(A.astype(t_high), ord=order)
                         np.assert_allclose(actual, desired)
 
-    @dec.skipif(NumpyVersion(np.__version__) < '1.7.0')
+    @dec.skipif(NumpyVersion(np.__version__) < '1.8.0')
     def test_axis_kwd(self):
         a = np.array([[[2, 1], [3, 4]]] * 2, 'd')
         b = norm(a, ord=np.inf, axis=(1, 0))