Remove yield test that are not support by pytest anymore

And remove comparison of str/unicode as it is not relevant anymore as
both are the same.

We can now unpin pytest as well, which we should make sure is in release
notes and in the conda-forge recipe

As nose does not understand `@parametrize`, and the nose `@skip`
decorator messes with that as well, we mark tests with parametrize as
not-tests for iptests

.travis.yml

@@ -41,7 +41,7 b' install:'
     fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
-  - pip install 'pytest<6' 'matplotlib !=3.2.0'
+  - pip install 'pytest' 'matplotlib !=3.2.0'
   - pip install codecov check-manifest pytest-cov --upgrade
 
 

IPython/lib/latextools.py

@@ -138,7 +138,7 b" def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):"
     except FindCmdError:
         return None
     try:
-        workdir = PurePath(tempfile.mkdtemp())
+        workdir = Path(tempfile.mkdtemp())
         tmpfile = workdir.joinpath("tmp.tex")
         dvifile = workdir.joinpath("tmp.dvi")
         outfile = workdir.joinpath("tmp.png")

IPython/lib/tests/test_latextools.py

@@ -9,11 +9,16 b' import nose.tools as nt'
 import pytest
 
 from IPython.lib import latextools
-from IPython.testing.decorators import onlyif_cmds_exist, skipif_not_matplotlib
+from IPython.testing.decorators import (
+    onlyif_cmds_exist,
+    skipif_not_matplotlib,
+    skip_iptest_but_not_pytest,
+)
 from IPython.utils.process import FindCmdError
 
 
 @pytest.mark.parametrize('command', ['latex', 'dvipng'])
+@skip_iptest_but_not_pytest
 def test_check_latex_to_png_dvipng_fails_when_no_cmd(command):
     def mock_find_cmd(arg):
         if arg == command:
@@ -23,8 +28,15 b' def test_check_latex_to_png_dvipng_fails_when_no_cmd(command):'
         assert latextools.latex_to_png_dvipng("whatever", True) == None
 
 
-@onlyif_cmds_exist('latex', 'dvipng')
-def test_latex_to_png_dvipng_runs():
+@contextmanager
+def no_op(*args, **kwargs):
+    yield
+
+
+@onlyif_cmds_exist("latex", "dvipng")
[e-mail]("s, wrap", [(u"$$x^2$$", False), (u"x^2", True)])
+@skip_iptest_but_not_pytest
+def test_latex_to_png_dvipng_runs(s, wrap):
     """
     Test that latex_to_png_dvipng just runs without error.
     """
@@ -32,36 +44,32 b' def test_latex_to_png_dvipng_runs():'
         assert filename == "breqn.sty"
         return None
 
-    for (s, wrap) in [(u"$$x^2$$", False), (u"x^2", True)]:
-        yield (latextools.latex_to_png_dvipng, s, wrap)
-
-        with patch.object(latextools, "kpsewhich", mock_kpsewhich):
-            yield (latextools.latex_to_png_dvipng, s, wrap)
+    latextools.latex_to_png_dvipng(s, wrap)
 
+    with patch_latextool(mock_kpsewhich):
+        latextools.latex_to_png_dvipng(s, wrap)
 
-@contextmanager
-def no_op(*args, **kwargs):
-    yield
 
 def mock_kpsewhich(filename):
         assert filename == "breqn.sty"
         return None
 
 @contextmanager
-def patch_latextool():
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+def patch_latextool(mock=mock_kpsewhich):
+    with patch.object(latextools, "kpsewhich", mock):
         yield
 
 @pytest.mark.parametrize('context', [no_op, patch_latextool])
 @pytest.mark.parametrize('s_wrap', [("$x^2$", False), ("x^2", True)])
+@skip_iptest_but_not_pytest
 def test_latex_to_png_mpl_runs(s_wrap, context):
     """
     Test that latex_to_png_mpl just runs without error.
     """
     try:
-        import matplotbli
+        import matplotlib
     except ImportError:
-        pytest.skip("This needs matplotlib to be availlable")
+        pytest.skip("This needs matplotlib to be available")
         return
     s, wrap = s_wrap
     with context():
@@ -81,7 +89,7 b' def test_genelatex_no_wrap():'
         assert False, ("kpsewhich should not be called "
                        "(called with {0})".format(filename))
 
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+    with patch_latextool(mock_kpsewhich):
         assert '\n'.join(latextools.genelatex("body text", False)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
@@ -101,7 +109,7 b' def test_genelatex_wrap_with_breqn():'
         assert filename == "breqn.sty"
         return "path/to/breqn.sty"
 
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+    with patch_latextool(mock_kpsewhich):
         assert '\n'.join(latextools.genelatex("x^2", True)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
@@ -124,7 +132,7 b' def test_genelatex_wrap_without_breqn():'
         assert filename == "breqn.sty"
         return None
 
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+    with patch_latextool(mock_kpsewhich):
         assert '\n'.join(latextools.genelatex("x^2", True)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}

IPython/lib/tests/test_pretty.py

@@ -12,9 +12,10 b' import string'
 import unittest
 
 import nose.tools as nt
+import pytest
 
 from IPython.lib import pretty
-from IPython.testing.decorators import skip_without
+from IPython.testing.decorators import skip_without, skip_iptest_but_not_pytest
 
 from io import StringIO
 
@@ -105,17 +106,36 b' def test_callability_checking():'
     nt.assert_equal(gotoutput, expectedoutput)
 
 
-def test_sets():
[e-mail](
+    "obj,expected_output",
+    zip(
+        [
+            set(),
+            frozenset(),
+            set([1]),
+            frozenset([1]),
+            set([1, 2]),
+            frozenset([1, 2]),
+            set([-1, -2, -3]),
+        ],
+        [
+            "set()",
+            "frozenset()",
+            "{1}",
+            "frozenset({1})",
+            "{1, 2}",
+            "frozenset({1, 2})",
+            "{-3, -2, -1}",
+        ],
+    ),
+)
+@skip_iptest_but_not_pytest
+def test_sets(obj, expected_output):
     """
     Test that set and frozenset use Python 3 formatting.
     """
-    objects = [set(), frozenset(), set([1]), frozenset([1]), set([1, 2]),
-        frozenset([1, 2]), set([-1, -2, -3])]
-    expected = ['set()', 'frozenset()', '{1}', 'frozenset({1})', '{1, 2}',
-        'frozenset({1, 2})', '{-3, -2, -1}']
-    for obj, expected_output in zip(objects, expected):
         got_output = pretty.pretty(obj)
-        yield nt.assert_equal, got_output, expected_output
+    nt.assert_equal(got_output, expected_output)
 
 
 @skip_without('xxlimited')

IPython/testing/decorators.py

@@ -154,6 +154,17 b' def make_label_dec(label, ds=None):'
     return decor
 
 
+def skip_iptest_but_not_pytest(f):
+    """
+    Warnign this will make the test invisible to iptest.
+    """
+    import os
+
+    if os.environ.get("IPTEST_WORKING_DIR", None) is not None:
+        f.__test__ = False
+    return f
+
+
 # Inspired by numpy's skipif, but uses the full apply_wrapper utility to
 # preserve function metadata better and allows the skip condition to be a
 # callable.

IPython/utils/tests/test_capture.py

@@ -16,6 +16,9 b''
 import sys
 
 import nose.tools as nt
+import pytest
+
+from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 from IPython.utils import capture
 
@@ -66,38 +69,45 b' hello_stderr = "hello, stderr"'
 #-----------------------------------------------------------------------------
 # Test Functions
 #-----------------------------------------------------------------------------
-
-def test_rich_output_empty():
[e-mail]("method_mime", _mime_map.items())
+@skip_iptest_but_not_pytest
+def test_rich_output_empty(method_mime):
     """RichOutput with no args"""
     rich = capture.RichOutput()
-    for method, mime in _mime_map.items():
-        yield nt.assert_equal, getattr(rich, method)(), None
+    method, mime = method_mime
+    nt.assert_equal(getattr(rich, method)(), None)
     
 def test_rich_output():
     """test RichOutput basics"""
     data = basic_data
     metadata = basic_metadata
     rich = capture.RichOutput(data=data, metadata=metadata)
-    yield nt.assert_equal, rich._repr_html_(), data['text/html']
-    yield nt.assert_equal, rich._repr_png_(), (data['image/png'], metadata['image/png'])
-    yield nt.assert_equal, rich._repr_latex_(), None
-    yield nt.assert_equal, rich._repr_javascript_(), None
-    yield nt.assert_equal, rich._repr_svg_(), None
+    nt.assert_equal(rich._repr_html_(), data["text/html"])
+    nt.assert_equal(rich._repr_png_(), (data["image/png"], metadata["image/png"]))
+    nt.assert_equal(rich._repr_latex_(), None)
+    nt.assert_equal(rich._repr_javascript_(), None)
+    nt.assert_equal(rich._repr_svg_(), None)
 
-def test_rich_output_no_metadata():
+
+@skip_iptest_but_not_pytest
[e-mail]("method_mime", _mime_map.items())
+def test_rich_output_no_metadata(method_mime):
     """test RichOutput with no metadata"""
     data = full_data
     rich = capture.RichOutput(data=data)
-    for method, mime in _mime_map.items():
-        yield nt.assert_equal, getattr(rich, method)(), data[mime]
+    method, mime = method_mime
+    nt.assert_equal(getattr(rich, method)(), data[mime])
+
 
-def test_rich_output_metadata():
+@skip_iptest_but_not_pytest
[e-mail]("method_mime", _mime_map.items())
+def test_rich_output_metadata(method_mime):
     """test RichOutput with metadata"""
     data = full_data
     metadata = full_metadata
     rich = capture.RichOutput(data=data, metadata=metadata)
-    for method, mime in _mime_map.items():
-        yield nt.assert_equal, getattr(rich, method)(), (data[mime], metadata[mime])
+    method, mime = method_mime
+    nt.assert_equal(getattr(rich, method)(), (data[mime], metadata[mime]))
 
 def test_rich_output_display():
     """test RichOutput.display
@@ -109,10 +119,10 b' def test_rich_output_display():'
     rich = capture.RichOutput(data=data)
     with capture.capture_output() as cap:
         rich.display()
-    yield nt.assert_equal, len(cap.outputs), 1
+    nt.assert_equal(len(cap.outputs), 1)
     rich2 = cap.outputs[0]
-    yield nt.assert_equal, rich2.data, rich.data
-    yield nt.assert_equal, rich2.metadata, rich.metadata
+    nt.assert_equal(rich2.data, rich.data)
+    nt.assert_equal(rich2.metadata, rich.metadata)
 
 def test_capture_output():
     """capture_output works"""
@@ -121,8 +131,9 b' def test_capture_output():'
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, hello_stdout, cap.stdout
-    yield nt.assert_equal, hello_stderr, cap.stderr
+    nt.assert_equal(hello_stdout, cap.stdout)
+    nt.assert_equal(hello_stderr, cap.stderr)
+
 
 def test_capture_output_no_stdout():
     """test capture_output(stdout=False)"""
@@ -131,9 +142,10 b' def test_capture_output_no_stdout():'
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, "", cap.stdout
-    yield nt.assert_equal, hello_stderr, cap.stderr
-    yield nt.assert_equal, len(cap.outputs), 1
+    nt.assert_equal("", cap.stdout)
+    nt.assert_equal(hello_stderr, cap.stderr)
+    nt.assert_equal(len(cap.outputs), 1)
+
 
 def test_capture_output_no_stderr():
     """test capture_output(stderr=False)"""
@@ -143,9 +155,10 b' def test_capture_output_no_stderr():'
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, hello_stdout, cap.stdout
-    yield nt.assert_equal, "", cap.stderr
-    yield nt.assert_equal, len(cap.outputs), 1
+    nt.assert_equal(hello_stdout, cap.stdout)
+    nt.assert_equal("", cap.stderr)
+    nt.assert_equal(len(cap.outputs), 1)
+
 
 def test_capture_output_no_display():
     """test capture_output(display=False)"""
@@ -154,6 +167,6 b' def test_capture_output_no_display():'
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, hello_stdout, cap.stdout
-    yield nt.assert_equal, hello_stderr, cap.stderr
-    yield nt.assert_equal, cap.outputs, []
  No newline at end of file
+    nt.assert_equal(hello_stdout, cap.stdout)
+    nt.assert_equal(hello_stderr, cap.stderr)
+    nt.assert_equal(cap.outputs, [])

IPython/utils/tests/test_pycolorize.py

@@ -20,15 +20,23 b' Authors'
 # third party
 import nose.tools as nt
 
+from IPython.testing.decorators import skip_iptest_but_not_pytest
+
 # our own
 from IPython.utils.PyColorize import Parser
 import io
+import pytest
+
+
[e-mail](scope="module", params=("Linux", "NoColor", "LightBG", "Neutral"))
+def style(request):
+    yield request.param
 
 #-----------------------------------------------------------------------------
 # Test functions
 #-----------------------------------------------------------------------------
 
-sample = u"""
+sample = """
 def function(arg, *args, kwarg=True, **kwargs):
     '''
     this is docs
@@ -47,17 +55,9 b' class Bar(Super):'
         super(Bar, self).__init__(1**2, 3^4, 5 or 6)
 """
 
-def test_loop_colors():
-
-    for style in ('Linux', 'NoColor','LightBG', 'Neutral'):
 
-        def test_unicode_colorize():
-            p = Parser(style=style)
-            f1 = p.format('1/0', 'str')
-            f2 = p.format(u'1/0', 'str')
-            nt.assert_equal(f1, f2)
-
-        def test_parse_sample():
+@skip_iptest_but_not_pytest
+def test_parse_sample(style):
             """and test writing to a buffer"""
             buf = io.StringIO()
             p = Parser(style=style)
@@ -65,14 +65,12 b' def test_loop_colors():'
             buf.seek(0)
             f1 = buf.read()
 
-            nt.assert_not_in('ERROR', f1)
+    nt.assert_not_in("ERROR", f1)
 
-        def test_parse_error():
-            p = Parser(style=style)
-            f1 = p.format(')', 'str')
-            if style != 'NoColor':
-                nt.assert_in('ERROR', f1)
 
-        yield test_unicode_colorize
-        yield test_parse_sample
-        yield test_parse_error
+@skip_iptest_but_not_pytest
+def test_parse_error(style):
+    p = Parser(style=style)
+    f1 = p.format(")", "str")
+    if style != "NoColor":
+        nt.assert_in("ERROR", f1)

IPython/utils/tests/test_tokenutil.py

@@ -3,6 +3,8 b''
 # Distributed under the terms of the Modified BSD License.
 
 import nose.tools as nt
+import pytest
+from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 from IPython.utils.tokenutil import token_at_cursor, line_at_cursor
 
@@ -120,14 +122,20 b' def test_line_at_cursor():'
     nt.assert_equal(line, "pri")
     nt.assert_equal(offset, 4)
 
-def test_multiline_statement():
+
[e-mail](
+    "c, token",
+    zip(
+        list(range(16, 22)) + list(range(22, 28)),
+        ["int"] * (22 - 16) + ["map"] * (28 - 22),
+    ),
+)
+@skip_iptest_but_not_pytest
+def test_multiline_statement(c, token):
     cell = """a = (1,
     3)
 
 int()
 map()
 """
-    for c in range(16, 22):
-        yield lambda cell, c: expect_token("int", cell, c), cell, c
-    for c in range(22, 28):
-        yield lambda cell, c: expect_token("map", cell, c), cell, c
+    expect_token(token, cell, c)

appveyor.yml

@@ -23,7 +23,7 b' init:'
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "%CMD_IN_ENV%  python -m pip install --upgrade setuptools pip"
-  - "%CMD_IN_ENV%  pip install nose coverage"
+  - "%CMD_IN_ENV%  pip install nose coverage pytest"
   - "%CMD_IN_ENV%  pip install .[test]"
   - "%CMD_IN_ENV%  mkdir results"
   - "%CMD_IN_ENV%  cd results"