diff --git a/python-curtsies.changes b/python-curtsies.changes index 0cdb54e..90dbfbb 100644 --- a/python-curtsies.changes +++ b/python-curtsies.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 2 11:10:20 UTC 2020 - Paolo Stivanin + +- Add remove-nose.patch + ------------------------------------------------------------------- Thu Apr 2 08:17:20 UTC 2020 - Marketa Calabkova diff --git a/python-curtsies.spec b/python-curtsies.spec index 07b06dd..0db328c 100644 --- a/python-curtsies.spec +++ b/python-curtsies.spec @@ -25,6 +25,8 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/bpython/curtsies Source: https://files.pythonhosted.org/packages/source/c/curtsies/curtsies-%{version}.tar.gz +# https://github.com/bpython/curtsies/pull/127 +Patch0: remove-nose.patch BuildRequires: %{python_module blessings} BuildRequires: %{python_module mock} BuildRequires: %{python_module nose} @@ -56,6 +58,7 @@ arrays of text. %prep %setup -q -n curtsies-%{version} +%patch0 -p1 %build %python_build @@ -65,7 +68,7 @@ arrays of text. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_expand nosetests-%{$python_bin_suffix} -v +%python_exec -m unittest discover -s tests -v %files %{python_files} %license LICENSE diff --git a/remove-nose.patch b/remove-nose.patch new file mode 100644 index 0000000..8c6772a --- /dev/null +++ b/remove-nose.patch @@ -0,0 +1,43 @@ +diff -ru curtsies.orig/setup.py curtsies/setup.py +--- curtsies.orig/setup.py 2020-04-02 13:00:55.681024818 +0200 ++++ curtsies/setup.py 2020-04-02 12:59:27.668878151 +0200 +@@ -47,7 +47,6 @@ + tests_require = [ + 'mock', + 'pyte', +- 'nose', + ], + classifiers=[ + 'Development Status :: 3 - Alpha', +diff -ru curtsies.orig/tests/test_terminal.py curtsies/tests/test_terminal.py +--- a/tests/test_terminal.py 2020-04-02 13:00:55.681024818 +0200 ++++ b/tests/test_terminal.py 2020-04-02 12:59:15.140857282 +0200 +@@ -37,8 +37,6 @@ + else: + return lambda x: x + +- import nose +- + def skipFailure(reason): + def dec(func): + @functools.wraps(func) +@@ -46,7 +44,7 @@ + try: + func(*args, **kwargs) + except Exception: +- raise nose.SkipTest ++ raise unittest.SkipTest + else: + raise AssertionError('Failure expected') + return inner +--- a/setup.cfg 2020-04-02 13:07:43.113698739 +0200 ++++ b/setup.cfg 2020-04-02 13:07:48.377707433 +0200 +@@ -1,8 +1,3 @@ +-[nosetests] +-with-doctest = 1 +-cover-package = curtsies +-cover-html = 1 +- + [bdist_wheel] + universal = 1 +