diff --git a/python-jupyter_console-remove-nose.patch b/python-jupyter_console-remove-nose.patch new file mode 100644 index 0000000..a8e1f8a --- /dev/null +++ b/python-jupyter_console-remove-nose.patch @@ -0,0 +1,22 @@ +Index: jupyter_console-6.1.0/jupyter_console/tests/test_console.py +=================================================================== +--- jupyter_console-6.1.0.orig/jupyter_console/tests/test_console.py 2020-01-16 00:32:32.000000000 +0100 ++++ jupyter_console-6.1.0/jupyter_console/tests/test_console.py 2020-09-15 12:58:23.543962909 +0200 +@@ -9,7 +9,7 @@ import sys + import tempfile + from subprocess import check_output + +-from nose import SkipTest ++import pytest + + from traitlets.tests.utils import check_help_all_output + from ipython_genutils.testing import decorators as dec +@@ -63,7 +63,7 @@ def start_console(): + try: + p = pexpect.spawn(cmd, args=args, env=env) + except IOError: +- raise SkipTest("Couldn't find command %s" % cmd) ++ pytest.skip("Couldn't find command %s" % cmd) + + # timeout after one minute + t = 60 diff --git a/python-jupyter_console.changes b/python-jupyter_console.changes index 0aa7b45..6103398 100644 --- a/python-jupyter_console.changes +++ b/python-jupyter_console.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Oct 2 14:15:27 UTC 2020 - pgajdos@suse.com + +- before test drop, try more runs for --flaky + +------------------------------------------------------------------- +Tue Sep 15 11:20:20 UTC 2020 - pgajdos@suse.com + +- replace nose by pytest +- added patches + https://github.com/jupyter/jupyter_console/pull/230 + + python-jupyter_console-remove-nose.patch + ------------------------------------------------------------------- Sun May 17 16:40:43 UTC 2020 - Benjamin Greiner diff --git a/python-jupyter_console.spec b/python-jupyter_console.spec index aa429e4..24413a6 100644 --- a/python-jupyter_console.spec +++ b/python-jupyter_console.spec @@ -25,6 +25,8 @@ Summary: Jupyter terminal console License: BSD-3-Clause URL: https://github.com/jupyter/jupyter_console Source0: https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-%{version}.tar.gz +# https://github.com/jupyter/jupyter_console/pull/230 +Patch0: python-jupyter_console-remove-nose.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -34,8 +36,8 @@ BuildRequires: %{python_module flaky} BuildRequires: %{python_module ipykernel} BuildRequires: %{python_module ipython} BuildRequires: %{python_module jupyter-client} -BuildRequires: %{python_module nose} BuildRequires: %{python_module prompt_toolkit >= 2} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module pyzmq} # /SECTION Requires: jupyter-jupyter_console = %{version} @@ -68,6 +70,7 @@ This package provides the jupyter components. %prep %setup -q -n jupyter_console-%{version} +%patch0 -p1 %build %python_build @@ -77,7 +80,7 @@ This package provides the jupyter components. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_expand nosetests-%{$python_bin_suffix} --with-flaky --force-flaky -v -s jupyter_console +%pytest -s --force-flaky --max-runs=10 %files %{python_files} %doc CONTRIBUTING.md README.md