MAINT moved test_lines to pytest

NelleV · NelleV · commit 178d6a1d81e7 · 2017-01-20T11:51:11.000-08:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1498,7 +1498,6 @@ def _jupyter_nbextension_paths():
     'matplotlib.tests.test_figure',
     'matplotlib.tests.test_font_manager',
     'matplotlib.tests.test_gridspec',
-    'matplotlib.tests.test_lines',
     'matplotlib.tests.test_mathtext',
     'matplotlib.tests.test_mlab',
     'matplotlib.tests.test_offsetbox',
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -4,11 +4,9 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-import six
 import itertools
 import matplotlib.lines as mlines
-import nose
-from nose.tools import assert_true, assert_raises
+from numpy.testing import assert_raises
 from timeit import repeat
 import numpy as np
 from cycler import cycler
@@ -59,7 +57,7 @@ def test_invisible_Line_rendering():
 
     slowdown_factor = (t_unvisible_line/t_no_line)
     slowdown_threshold = 2 # trying to avoid false positive failures
-    assert_true(slowdown_factor < slowdown_threshold)
+    assert slowdown_factor < slowdown_threshold
 
 
 @cleanup
@@ -186,10 +184,6 @@ def test_lw_scaling():
 
 def test_nan_is_sorted():
     line = mlines.Line2D([], [])
-    assert_true(line._is_sorted(np.array([1, 2, 3])))
-    assert_true(line._is_sorted(np.array([1, np.nan, 3])))
-    assert_true(not line._is_sorted([3, 5] + [np.nan] * 100 + [0, 2]))
-
-
-if __name__ == '__main__':
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
+    assert line._is_sorted(np.array([1, 2, 3]))
+    assert line._is_sorted(np.array([1, np.nan, 3]))
+    assert not line._is_sorted([3, 5] + [np.nan] * 100 + [0, 2])
