Convert remaining test_t* files to pytest.

QuLogic · QuLogic · commit a498e248fa9f · 2017-01-21T14:49:29.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1512,11 +1512,8 @@ def _jupyter_nbextension_paths():
     'matplotlib.tests.test_streamplot',
     'matplotlib.tests.test_style',
     'matplotlib.tests.test_subplots',
-    'matplotlib.tests.test_table',
     'matplotlib.tests.test_text',
     'matplotlib.tests.test_texmanager',
-    'matplotlib.tests.test_tightlayout',
-    'matplotlib.tests.test_triangulation',
     'matplotlib.tests.test_type1font',
     'matplotlib.tests.test_ttconv',
     'matplotlib.tests.test_units',
diff --git a/lib/matplotlib/tests/test_table.py b/lib/matplotlib/tests/test_table.py
@@ -9,7 +9,6 @@
 
 from matplotlib.table import CustomCell
 from matplotlib.path import Path
-from nose.tools import assert_equal
 
 
 @cleanup
@@ -127,7 +126,7 @@ def test_customcell():
     for t, c in zip(types, codes):
         cell = CustomCell((0, 0), visible_edges=t, width=1, height=1)
         code = tuple(s for _, s in cell.get_path().iter_segments())
-        assert_equal(c, code)
+        assert c == code
 
 
 @image_comparison(baseline_images=['table_auto_column'],
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
@@ -8,8 +8,6 @@
 
 from matplotlib.testing.decorators import image_comparison, knownfailureif
 import matplotlib.pyplot as plt
-from nose.tools import assert_raises
-from numpy.testing import assert_array_equal
 from matplotlib.offsetbox import AnchoredOffsetbox, DrawingArea
 from matplotlib.patches import Rectangle
 
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -6,7 +6,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.tri as mtri
-from nose.tools import assert_equal, assert_raises, assert_true, assert_false
+import pytest
 from numpy.testing import assert_array_equal, assert_array_almost_equal,\
     assert_array_less
 import numpy.ma.testutils as matest
@@ -39,14 +39,14 @@ def test_delaunay():
     assert_array_almost_equal(triang.y, y)
 
     # Triangles - integers.
-    assert_equal(len(triang.triangles), ntriangles)
-    assert_equal(np.min(triang.triangles), 0)
-    assert_equal(np.max(triang.triangles), npoints-1)
+    assert len(triang.triangles) == ntriangles
+    assert np.min(triang.triangles) == 0
+    assert np.max(triang.triangles) == npoints-1
 
     # Edges - integers.
-    assert_equal(len(triang.edges), nedges)
-    assert_equal(np.min(triang.edges), 0)
-    assert_equal(np.max(triang.edges), npoints-1)
+    assert len(triang.edges) == nedges
+    assert np.min(triang.edges) == 0
+    assert np.max(triang.edges) == npoints-1
 
     # Neighbors - integers.
     # Check that neighbors calculated by C++ triangulation class are the same
@@ -86,7 +86,8 @@ def test_delaunay_points_in_line():
     # that delaunay code fails gracefully.
     x = np.linspace(0.0, 10.0, 11)
     y = np.linspace(0.0, 10.0, 11)
-    assert_raises(RuntimeError, mtri.Triangulation, x, y)
+    with pytest.raises(RuntimeError):
+        mtri.Triangulation(x, y)
 
     # Add an extra point not on the line and the triangulation is OK.
     x = np.append(x, 2.0)
@@ -96,16 +97,21 @@ def test_delaunay_points_in_line():
 
 def test_delaunay_insufficient_points():
     # Triangulation should raise a ValueError if passed less than 3 points.
-    assert_raises(ValueError, mtri.Triangulation, [], [])
-    assert_raises(ValueError, mtri.Triangulation, [1], [5])
-    assert_raises(ValueError, mtri.Triangulation, [1, 2], [5, 6])
+    with pytest.raises(ValueError):
+        mtri.Triangulation([], [])
+    with pytest.raises(ValueError):
+        mtri.Triangulation([1], [5])
+    with pytest.raises(ValueError):
+        mtri.Triangulation([1, 2], [5, 6])
 
     # Triangulation should also raise a ValueError if passed duplicate points
     # such that there are less than 3 unique points.
-    assert_raises(ValueError, mtri.Triangulation, [1, 2, 1], [5, 6, 5])
-    assert_raises(ValueError, mtri.Triangulation, [1, 2, 2], [5, 6, 6])
-    assert_raises(ValueError, mtri.Triangulation, [1, 1, 1, 2, 1, 2],
-                  [5, 5, 5, 6, 5, 6])
+    with pytest.raises(ValueError):
+        mtri.Triangulation([1, 2, 1], [5, 6, 5])
+    with pytest.raises(ValueError):
+        mtri.Triangulation([1, 2, 2], [5, 6, 6])
+    with pytest.raises(ValueError):
+        mtri.Triangulation([1, 1, 1, 2, 1, 2], [5, 5, 5, 6, 5, 6])
 
 
 def test_delaunay_robust():
@@ -149,7 +155,7 @@ def tris_contain_point(triang, xy):
     # overlapping triangles; qhull is OK.
     triang = mtri.Triangulation(tri_points[:, 0], tri_points[:, 1])
     for test_point in test_points:
-        assert_equal(tris_contain_point(triang, test_point), 1)
+        assert tris_contain_point(triang, test_point) == 1
 
     # If ignore the first point of tri_points, matplotlib.delaunay throws a
     # KeyError when calculating the convex hull; qhull is OK.
@@ -283,7 +289,7 @@ def test_trifinder():
     assert_array_equal(tris, [-1, 0, 1, -1])
 
     triang.set_mask([1, 0])
-    assert_equal(trifinder, triang.get_trifinder())
+    assert trifinder == triang.get_trifinder()
     tris = trifinder(xs, ys)
     assert_array_equal(tris, [-1, -1, 1, -1])
 
@@ -971,10 +977,10 @@ def test_trirefiner_fortran_contiguous_triangles():
     # github issue 4180.  Test requires two arrays of triangles that are
     # identical except that one is C-contiguous and one is fortran-contiguous.
     triangles1 = np.array([[2, 0, 3], [2, 1, 0]])
-    assert_false(np.isfortran(triangles1))
+    assert not np.isfortran(triangles1)
 
     triangles2 = np.array(triangles1, copy=True, order='F')
-    assert_true(np.isfortran(triangles2))
+    assert np.isfortran(triangles2)
 
     x = np.array([0.39, 0.59, 0.43, 0.32])
     y = np.array([33.99, 34.01, 34.19, 34.18])
@@ -1033,9 +1039,5 @@ def test_tricontourf_decreasing_levels():
     y = [0.0, 0.0, 1.0]
     z = [0.2, 0.4, 0.6]
     plt.figure()
-    assert_raises(ValueError, plt.tricontourf, x, y, z, [1.0, 0.0])
-
-
-if __name__ == '__main__':
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
+    with pytest.raises(ValueError):
+        plt.tricontourf(x, y, z, [1.0, 0.0])
