From 93bfc4ac4820215df8b5ad59df074e65b4b7948e54a61fcc73a25bbca1b95f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 26 Mar 2020 12:10:15 +0000 Subject: [PATCH] Accepting request 788519 from home:polslinux:branches:devel:languages:python - Add remove_nose.patch * as nose won't work with Python 3.9/3.10 OBS-URL: https://build.opensuse.org/request/show/788519 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exam?expand=0&rev=5 --- python-exam.changes | 6 ++++++ python-exam.spec | 10 ++++++---- remove_nose.patch | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 remove_nose.patch diff --git a/python-exam.changes b/python-exam.changes index c047b58..887c6c8 100644 --- a/python-exam.changes +++ b/python-exam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 26 10:32:50 UTC 2020 - Paolo Stivanin + +- Add remove_nose.patch + * as nose won't work with Python 3.9/3.10 + ------------------------------------------------------------------- Tue Dec 4 12:47:48 UTC 2018 - Matej Cepl diff --git a/python-exam.spec b/python-exam.spec index 4e8bc20..46dd1e6 100644 --- a/python-exam.spec +++ b/python-exam.spec @@ -1,7 +1,7 @@ # # spec file for package python-exam # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,13 +24,14 @@ Release: 0 Summary: Helpers for better testing License: MIT Group: Development/Languages/Python -Url: https://github.com/fluxx/exam +URL: https://github.com/fluxx/exam Source: https://files.pythonhosted.org/packages/source/e/exam/exam-%{version}.tar.gz +# https://github.com/Fluxx/exam/pull/50 +Patch0: remove_nose.patch BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros %if %{with test} BuildRequires: %{python_module mock} -BuildRequires: %{python_module nose} %endif BuildRequires: fdupes %ifpython2 @@ -50,6 +51,7 @@ conventions and adhering to the unit testing interface. %prep %setup -q -n exam-%{version} +%patch0 -p1 %build %python_build @@ -60,7 +62,7 @@ conventions and adhering to the unit testing interface. %if %{with test} %check -%python_exec setup.py nosetests +%python_exec -m unittest discover -s tests/ -v %endif %files %{python_files} diff --git a/remove_nose.patch b/remove_nose.patch new file mode 100644 index 0000000..2cc5147 --- /dev/null +++ b/remove_nose.patch @@ -0,0 +1,18 @@ +--- a/setup.py 2020-03-26 12:27:17.135857081 +0100 ++++ b/setup.py 2020-03-26 12:27:32.139881471 +0100 +@@ -10,14 +10,9 @@ + + install_requires = ['mock'] + lint_requires = ['pep8', 'pyflakes'] +-tests_require = ['nose'] +- +-if sys.version_info < (2, 7): +- tests_require.append('unittest2') ++tests_require = ['unittest'] + + setup_requires = [] +-if 'nosetests' in sys.argv[1:]: +- setup_requires.append('nose') + + setup( + name='exam',