removed mentions of 'import nose'

matplotlib · pizzathief · Oct 31, 2015 · Nov 4, 2015 · Nov 4, 2015 · Nov 4, 2015
commit 726cc928394a5878b06b7fd271ffb3e54df50223
diff --git a/conftest.py b/conftest.py
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -7,7 +7,6 @@
 import tempfile
 import numpy as np
 from numpy.testing import assert_equal
-from nose import with_setup
 from matplotlib import pyplot as plt
 from matplotlib import animation
 from matplotlib.testing.decorators import cleanup

diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -8,14 +8,13 @@
 import shutil

 import numpy as np
-import nose
-from nose.plugins.skip import SkipTest

 import matplotlib as mpl
 import matplotlib.pyplot as plt
 from matplotlib.compat import subprocess
 from matplotlib.testing.compare import compare_images, ImageComparisonFailure
 from matplotlib.testing.decorators import _image_directories, switch_backend
+import pytest


 baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
@@ -83,7 +82,7 @@ def create_figure():
 @switch_backend('pgf')
 def test_xelatex():
    if not check_for('xelatex'):
-        raise SkipTest('xelatex + pgf is required')
+        raise pytest.skip('xelatex + pgf is required')

    rc_xelatex = {'font.family': 'serif',
                  'pgf.rcfonts': False}
@@ -96,7 +95,7 @@ def test_xelatex():
 @switch_backend('pgf')
 def test_pdflatex():
    if not check_for('pdflatex'):
-        raise SkipTest('pdflatex + pgf is required')
+        raise pytest.skip('pdflatex + pgf is required')

    rc_pdflatex = {'font.family': 'serif',
                   'pgf.rcfonts': False,
@@ -112,7 +111,7 @@ def test_pdflatex():
 @switch_backend('pgf')
 def test_rcupdate():
    if not check_for('xelatex') or not check_for('pdflatex'):
-        raise SkipTest('xelatex and pdflatex + pgf required')
+        raise pytest.skip('xelatex and pdflatex + pgf required')

    rc_sets = []
    rc_sets.append({'font.family': 'sans-serif',
@@ -141,7 +140,7 @@ def test_rcupdate():
 @switch_backend('pgf')
 def test_pathclip():
    if not check_for('xelatex'):
-        raise SkipTest('xelatex + pgf is required')
+        raise pytest.skip('xelatex + pgf is required')

    rc_xelatex = {'font.family': 'serif',
                  'pgf.rcfonts': False}
@@ -159,7 +158,7 @@ def test_pathclip():
 @switch_backend('pgf')
 def test_mixedmode():
    if not check_for('xelatex'):
-        raise SkipTest('xelatex + pgf is required')
+        raise pytest.skip('xelatex + pgf is required')

    rc_xelatex = {'font.family': 'serif',
                  'pgf.rcfonts': False}
@@ -175,7 +174,7 @@ def test_mixedmode():
 @switch_backend('pgf')
 def test_bbox_inches():
    if not check_for('xelatex'):
-        raise SkipTest('xelatex + pgf is required')
+        raise pytest.skip('xelatex + pgf is required')

    rc_xelatex = {'font.family': 'serif',
                  'pgf.rcfonts': False}

diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -3,10 +3,7 @@

 from fnmatch import fnmatch
 import os
-
-from nose.tools import assert_equal
-from nose.plugins.skip import SkipTest
-import pytest
+# import pytest

 try:
    import pep8
@@ -102,7 +99,7 @@ def get_file_results(self):
 #     """
 #
 #     if not HAS_PEP8:
-#         raise SkipTest('The pep8 tool is required for this test')
+#         raise pytest.skip('The pep8 tool is required for this test')
 #
 #     # to get a list of bad files, rather than the specific errors, add
 #     # "reporter=pep8.FileReport" to the StyleGuide constructor.

diff --git a/lib/matplotlib/tests/test_compare_images.py b/lib/matplotlib/tests/test_compare_images.py
@@ -6,7 +6,7 @@
 import os
 import shutil

-from nose.tools import assert_equal, assert_not_equal, assert_almost_equal
+from numpy.testing import assert_almost_equal

 from matplotlib.testing.compare import compare_images
 from matplotlib.testing.decorators import _image_directories

diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -9,7 +9,7 @@
 from matplotlib import mlab
 from matplotlib.testing.decorators import cleanup, image_comparison
 from matplotlib import pyplot as plt
-from nose.tools import assert_equal, assert_raises
+import pytest
 import warnings

 import re
@@ -284,12 +284,12 @@ def test_contourf_decreasing_levels():
    # github issue 5477.
    z = [[0.1, 0.3], [0.5, 0.7]]
    plt.figure()
-    assert_raises(ValueError, plt.contourf, z, [1.0, 0.0])
+    pytest.raises(ValueError, plt.contourf, z, [1.0, 0.0])
    # Legacy contouring algorithm gives a warning rather than raising an error,
    # plus a DeprecationWarning.
    with warnings.catch_warnings(record=True) as w:
        plt.contourf(z, [1.0, 0.0], corner_mask='legacy')
-    assert_equal(len(w), 2)
+    assert len(w) == 2


 @cleanup

diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -4,8 +4,7 @@
 from matplotlib.cbook import MatplotlibDeprecationWarning
 import matplotlib.pyplot as plt
 import numpy as np
-from nose.tools import assert_raises
-
+import pytest
 from cycler import cycler


@@ -173,14 +172,18 @@ def test_cycle_reset():
 @cleanup
 def test_invalid_input_forms():
    fig, ax = plt.subplots()
-    assert_raises((TypeError, ValueError), ax.set_prop_cycle, 1)
-    assert_raises((TypeError, ValueError), ax.set_prop_cycle, [1, 2])
-    assert_raises((TypeError, ValueError), ax.set_prop_cycle, 'color', 'fish')
-    assert_raises((TypeError, ValueError), ax.set_prop_cycle, 'linewidth', 1)
-    assert_raises((TypeError, ValueError), ax.set_prop_cycle,
-            'linewidth', {'1': 1, '2': 2})
-    assert_raises((TypeError, ValueError), ax.set_prop_cycle,
-            linewidth=1, color='r')
+    with pytest.raises(TypeError, ValueError):
+        ax.set_prop_cycle(1)
+    with pytest.raises(TypeError, ValueError):
+        ax.set_prop_cycle([1, 2])
+    with pytest.raises(TypeError, ValueError):
+        ax.set_prop_cycle('color', 'fish')
+    with pytest.raises(TypeError, ValueError):
+        ax.set_prop_cycle('linewidth', 1)
+    with pytest.raises(TypeError, ValueError):
+        ax.set_prop_cycle('linewidth', {'1': 1, '2': 2})
+    with pytest.raises(TypeError, ValueError):
+        ax.set_prop_cycle(linewidth=1, color='r')


 if __name__ == '__main__':

diff --git a/lib/matplotlib/tests/test_dviread.py b/lib/matplotlib/tests/test_dviread.py
@@ -3,25 +3,25 @@

 from matplotlib.externals import six

-from nose.tools import assert_equal, with_setup
 import matplotlib.dviread as dr
 import os.path
 import json


 original_find_tex_file = dr.find_tex_file

-
-def setup_PsfontsMap():
-    dr.find_tex_file = lambda x: x
-
-
 def teardown_PsfontsMap():
    dr.find_tex_file = original_find_tex_file

+@pytest.fixture()
+def setup_PsfontsMap(request):
+    dr.find_tex_file = lambda x: x
+    def fin():
+        teardown_PsfontsMap()
+    request.addfinalizer(fin)
+

-@with_setup(setup_PsfontsMap, teardown_PsfontsMap)
-def test_PsfontsMap():
+def test_PsfontsMap(setup_PsfontsMap):
    filename = os.path.join(
        os.path.dirname(__file__),
        'baseline_images', 'dviread', 'test.map')

diff --git a/lib/matplotlib/tests/test_labeled_data_unpacking.py b/lib/matplotlib/tests/test_labeled_data_unpacking.py
@@ -1,7 +1,5 @@
 from __future__ import (absolute_import, division, print_function)

-from nose.tools import (assert_raises, assert_equal)
-from nose.plugins.skip import SkipTest
 import pytest

 try:
@@ -192,7 +190,7 @@ def test_function_call_with_pandas_data():
    try:
        import pandas as pd
    except ImportError:
-        raise SkipTest("Pandas not installed")
+        raise pytest.skip("Pandas not installed")

    data = pd.DataFrame({"a": [1, 2], "b": [8, 9], "w": ["NOT", "NOT"]})


diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -8,8 +8,7 @@
 from numpy.testing import assert_allclose, assert_array_equal
 import numpy.ma.testutils as matest
 import numpy as np
-# from nose.tools import (assert_equal, assert_almost_equal, assert_not_equal,
-#                         assert_true, assert_raises)
+from numpy.testing import assert_almost_equal

 import matplotlib.mlab as mlab
 import matplotlib.cbook as cbook

diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -15,9 +15,6 @@
 from matplotlib.tests import assert_str_equal
 from matplotlib.testing.decorators import cleanup
 import matplotlib.colors as mcolors
-# from nose.tools import assert_true, assert_raises, assert_equal
-# from nose.plugins.skip import SkipTest
-# import nose
 from itertools import chain
 import numpy as np
 from matplotlib.rcsetup import (validate_bool_maybe_none,
@@ -116,7 +113,7 @@ def test_RcParams_class():

 def test_rcparams_update():
    if sys.version_info[:2] < (2, 7):
-        raise nose.SkipTest("assert_raises as context manager "
+        raise pytest.skip("assert_raises as context manager "
                            "not supported with Python < 2.7")
    rc = mpl.RcParams({'figure.figsize': (3.5, 42)})
    bad_dict = {'figure.figsize': (3.5, 42, 1)}
@@ -132,7 +129,7 @@ def test_rcparams_update():

 def test_rcparams_init():
    if sys.version_info[:2] < (2, 7):
-        raise nose.SkipTest("assert_raises as context manager "
+        raise pytest.skip("assert_raises as context manager "
                            "not supported with Python < 2.7")
    with pytest.raises(ValueError):
        with warnings.catch_warnings():
@@ -178,7 +175,7 @@ def test_Bug_2543_newer_python():
    # only split from above because of the usage of assert_raises
    # as a context manager, which only works in 2.7 and above
    if sys.version_info[:2] < (2, 7):
-        raise nose.SkipTest(
+        raise pytest.skip(
            "assert_raises as context manager not supported with Python < 2.7")
    from matplotlib.rcsetup import validate_bool_maybe_none, validate_bool
    with pytest.raises(ValueError):
@@ -259,7 +256,7 @@ def _validation_test_helper(validator, arg, target):

 def _validation_fail_helper(validator, arg, exception_type):
    if sys.version_info[:2] < (2, 7):
-        raise nose.SkipTest("assert_raises as context manager not "
+        raise pytest.skip("assert_raises as context manager not "
                            "supported with Python < 2.7")
    pytest.raises(exception_type,validator, arg)

@@ -400,7 +397,7 @@ def test_rcparams_reset_after_fail():
    if sys.version_info[:2] >= (2, 7):
        from collections import OrderedDict
    else:
-        raise SkipTest("Test can only be run in Python >= 2.7"
+        raise pytest.skip("Test can only be run in Python >= 2.7"
                       " as it requires OrderedDict")

    with mpl.rc_context(rc={'text.usetex': False}):

diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py
@@ -7,10 +7,6 @@
 import tempfile
 from contextlib import contextmanager

-from nose import SkipTest
-from nose.tools import assert_raises
-from nose.plugins.attrib import attr
-
 import matplotlib as mpl
 from matplotlib import style
 from matplotlib.style.core import USER_LIBRARY_PATHS, STYLE_EXTENSION
@@ -58,7 +54,7 @@ def test_use():
            assert mpl.rcParams[PARAM] == VALUE


-@attr('network')
+@pytest.mark.network
 def test_use_url():
    with temp_style('test', DUMMY_SETTINGS):
        with style.context('https://gist.github.com/adrn/6590261/raw'):
@@ -126,7 +122,7 @@ def test_context_with_badparam():
        from collections import OrderedDict
    else:
        m = "Test can only be run in Python >= 2.7 as it requires OrderedDict"
-        raise SkipTest(m)
+        raise pytest.skip(m)

    original_value = 'gray'
    other_value = 'blue'

diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -6,8 +6,6 @@

 import numpy as np
 from numpy.testing import assert_almost_equal
-from nose.tools import eq_, assert_raises
-from nose.plugins.skip import SkipTest

 from matplotlib.transforms import Bbox
 import matplotlib
@@ -290,7 +288,7 @@ def test_get_rotation_raises():
    from matplotlib import text
    import sys
    if sys.version_info[:2] < (2, 7):
-        raise SkipTest("assert_raises as context manager "
+        raise pytest.skip("assert_raises as context manager "
                       "not supported with Python < 2.7")
    pytest.raises(ValueError, text.get_rotation, 'hozirontal')


diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py
@@ -3,7 +3,6 @@

 from matplotlib.externals import six

-from nose.tools import assert_equal, assert_in
 import matplotlib.type1font as t1f
 import os.path
 import difflib
@@ -41,7 +40,7 @@ def test_Type1Font():
         # Alters ItalicAngle
         '-  /ItalicAngle 0 def',
         '+  /ItalicAngle -45.0 def'):
-        assert_in(line, diff, 'diff to slanted font must contain %s' % line)
+        assert line in diff, 'diff to slanted font must contain %s' % line

    diff = list(differ.compare(font.parts[0].decode('latin-1').splitlines(),
                          condensed.parts[0].decode('latin-1').splitlines()))
@@ -55,4 +54,4 @@ def test_Type1Font():
         # Alters FontMatrix
         '- /FontMatrix [0.001 0 0 0.001 0 0 ]readonly def',
         '+ /FontMatrix [0.0005 0.0 0.0 0.001 0.0 0.0]readonly def'):
-        assert_in(line, diff, 'diff to condensed font must contain %s' % line)
+        assert line in diff, 'diff to condensed font must contain %s' % line