From c8591a2e90488b9235a1fe2307a5c16e54b39ff2584bcda40a2835fa40d7b128 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 13 Aug 2018 12:18:01 +0000 Subject: [PATCH 1/2] - Remove dependency on unittest2 Add remove_unittest2.patch to faciliate that - Upgrade to 0.8.0: List of changes is too long to show here, see https://github.com/nose-devs/nose2/blob/master/docs/changelog.rst changes between 0.6.5 and 0.8.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-nose2?expand=0&rev=5 --- nose2-0.6.5.tar.gz | 3 --- nose2-0.8.0.tar.gz | 3 +++ python-nose2.changes | 10 ++++++++++ python-nose2.spec | 24 +++++++++++++----------- remove_unittest2.patch | 11 +++++++++++ 5 files changed, 37 insertions(+), 14 deletions(-) delete mode 100644 nose2-0.6.5.tar.gz create mode 100644 nose2-0.8.0.tar.gz create mode 100644 remove_unittest2.patch diff --git a/nose2-0.6.5.tar.gz b/nose2-0.6.5.tar.gz deleted file mode 100644 index d0b2924..0000000 --- a/nose2-0.6.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:479bab6880468f26fd8a1301d222ec97243e9a539501b5d242307bfa03969ff4 -size 131682 diff --git a/nose2-0.8.0.tar.gz b/nose2-0.8.0.tar.gz new file mode 100644 index 0000000..0a85279 --- /dev/null +++ b/nose2-0.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3 +size 142142 diff --git a/python-nose2.changes b/python-nose2.changes index 4074f80..510cd3b 100644 --- a/python-nose2.changes +++ b/python-nose2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 13 12:13:57 UTC 2018 - mcepl@suse.com + +- Remove dependency on unittest2 + Add remove_unittest2.patch to faciliate that +- Upgrade to 0.8.0: + List of changes is too long to show here, see + https://github.com/nose-devs/nose2/blob/master/docs/changelog.rst + changes between 0.6.5 and 0.8.0 + ------------------------------------------------------------------- Wed Jun 28 06:07:30 UTC 2017 - jengelh@inai.de diff --git a/python-nose2.spec b/python-nose2.spec index 72a862a..ea114de 100644 --- a/python-nose2.spec +++ b/python-nose2.spec @@ -1,7 +1,7 @@ # # spec file for package python-nose2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,26 +18,25 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-nose2 -Version: 0.6.5 +Version: 0.8.0 Release: 0 Summary: Nose2 is the next generation of nicer testing for Python -License: BSD-2-Clause and Python-2.0 +License: BSD-2-Clause AND Python-2.0 Group: Development/Languages/Python -Url: https://github.com/nose-devs/nose2 +URL: https://github.com/nose-devs/nose2 Source: https://files.pythonhosted.org/packages/source/n/nose2/nose2-%{version}.tar.gz +Patch0: remove_unittest2.patch BuildRequires: %{python_module cov-core >= 1.12} -BuildRequires: %{python_module devel} +BuildRequires: %{python_module mock} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.1} -BuildRequires: %{python_module unittest2} +BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-six >= 1.1 Requires(post): update-alternatives Requires(postun): update-alternatives Suggests: python-cov-core >= 1.12 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %python_subpackages %description @@ -51,17 +50,20 @@ is to be done through config files, not command-line options. %prep %setup -q -n nose2-%{version} +%autopatch -p1 %build %python_build %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/nose2 %check -#LC_CTYPE=C.UTF8 python setup.py test +export LC_CTYPE=C.UTF8 +%python_exec setup.py test %post %python_install_alternative nose2 @@ -70,8 +72,8 @@ is to be done through config files, not command-line options. %python_uninstall_alternative nose2 %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS README.rst license.txt +%license license.txt +%doc AUTHORS README.rst %python_alternative %{_bindir}/nose2 %{python_sitelib}/* diff --git a/remove_unittest2.patch b/remove_unittest2.patch new file mode 100644 index 0000000..b6075e9 --- /dev/null +++ b/remove_unittest2.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -93,7 +93,7 @@ else: + ], + } + params['install_requires'] = parse_requirements('requirements.txt') +- params['test_suite'] = 'unittest.collector' ++ params['test_suite'] = 'nose2.tests' + params['extras_require']['doc'] = parse_requirements('requirements-docs.txt') + params['extras_require'].update(add_per_version_requirements()) + From 5c896720ad9acc85ba82a2954c1a061e0902fcd529b4b22a7293c509dcf43fa8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 16 Aug 2018 10:37:11 +0000 Subject: [PATCH 2/2] Accepting request 629533 from home:jengelh:branches:devel:languages:python - Avoid name repetition in summary (rpmlint). OBS-URL: https://build.opensuse.org/request/show/629533 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-nose2?expand=0&rev=6 --- python-nose2.changes | 5 +++++ python-nose2.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-nose2.changes b/python-nose2.changes index 510cd3b..f0bb77f 100644 --- a/python-nose2.changes +++ b/python-nose2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 16 10:22:15 UTC 2018 - jengelh@inai.de + +- Avoid name repetition in summary (rpmlint). + ------------------------------------------------------------------- Mon Aug 13 12:13:57 UTC 2018 - mcepl@suse.com diff --git a/python-nose2.spec b/python-nose2.spec index ea114de..50a697b 100644 --- a/python-nose2.spec +++ b/python-nose2.spec @@ -20,7 +20,7 @@ Name: python-nose2 Version: 0.8.0 Release: 0 -Summary: Nose2 is the next generation of nicer testing for Python +Summary: Second generation of the "nose" Python testing framework License: BSD-2-Clause AND Python-2.0 Group: Development/Languages/Python URL: https://github.com/nose-devs/nose2