From 4c6a6e4d5f5a5287ec64e8cc1a1f0ddf5f35f77819643fe405e6ddfedd36e9c6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 20 Aug 2022 21:28:47 +0000 Subject: [PATCH] Accepting request 998256 from home:bnavigator:branches:devel:languages:python - Disable testing with nose2 * nose2 is actively maintained, but not used much in the distribution. No need to test it in Ring1. OBS-URL: https://build.opensuse.org/request/show/998256 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-parameterized?expand=0&rev=26 --- python-parameterized.changes | 7 +++++++ python-parameterized.spec | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/python-parameterized.changes b/python-parameterized.changes index a1ebd9f..6829afd 100644 --- a/python-parameterized.changes +++ b/python-parameterized.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 19 18:54:32 UTC 2022 - Ben Greiner + +- Disable testing with nose2 + * nose2 is actively maintained, but not used much in the + distribution. No need to test it in Ring1. + ------------------------------------------------------------------- Thu Apr 14 17:07:13 UTC 2022 - Ben Greiner diff --git a/python-parameterized.spec b/python-parameterized.spec index f28f831..85d78b5 100644 --- a/python-parameterized.spec +++ b/python-parameterized.spec @@ -16,6 +16,14 @@ # +%bcond_with ringdisabled +%if %{with ringdisabled} +# nose2 is actively maintained, but not used much in the distribution. No need to test it in ring1 +%bcond_with nose2 +%else +%bcond_without nose2 +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-parameterized Version: 0.8.1 @@ -29,12 +37,13 @@ Patch0: parameterized-pr116-pytest4.patch # PATCH-FIX-OPENSUSE remove_nose.patch mcepl@suse.com # Remove nose dependency (patch is not very good, DO NOT SEND UPSTREAM!) Patch1: remove_nose.patch -BuildRequires: %{python_module nose2} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +%if %{with nose2} +BuildRequires: %{python_module nose2} +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros -Suggests: python-nose2 BuildArch: noarch %python_subpackages @@ -56,7 +65,9 @@ Parameterized testing with any Python test framework. # https://github.com/wolever/parameterized/issues/122 sed -i 's:import mock:from unittest import mock:' parameterized/test.py export LANG=en_US.UTF8 +%if %{with nose2} %{python_expand nose2-%$python_version -v -B --pretty-assert} +%endif %python_exec -m unittest parameterized.test # https://github.com/wolever/parameterized/issues/122 %pytest parameterized/test.py -k 'not (test_with_docstring_1_v_l_ or test_with_docstring_0_value1)' @@ -64,6 +75,7 @@ export LANG=en_US.UTF8 %files %{python_files} %doc CHANGELOG.txt README.rst %license LICENSE.txt -%{python_sitelib}/* +%{python_sitelib}/parameterized +%{python_sitelib}/parameterized-%{version}*-info %changelog