diff --git a/python-stestr.changes b/python-stestr.changes index 82d05b0..6af55bf 100644 --- a/python-stestr.changes +++ b/python-stestr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 4 23:06:52 UTC 2024 - Dirk Müller + +- switch to singlespec cliff package + ------------------------------------------------------------------- Mon Dec 4 10:52:17 UTC 2023 - Dirk Müller diff --git a/python-stestr.spec b/python-stestr.spec index 57bf5d5..8d2be88 100644 --- a/python-stestr.spec +++ b/python-stestr.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,8 @@ Requires: python-python-subunit >= 1.4.0 Requires: python-testtools >= 2.2.0 Requires: python-tomlkit >= 0.11.6 Requires: python-voluptuous >= 0.8.9 +Requires(post): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch %if %{with test} BuildRequires: %{python_module SQLAlchemy} @@ -52,11 +54,7 @@ BuildRequires: %{python_module iso8601} BuildRequires: %{python_module pytest} BuildRequires: %{python_module stestr = %{version}} %endif -%if "%{python_flavor}" == "python3" || "%{?python_provides}" == "python3" -# cliff, required for the cli, is only available for the python3 flavor -Requires: python3-cliff -Requires: python-dbm -%endif +Requires: python-cliff %if !0%{?_no_weakdeps} Recommends: python-SQLAlchemy Recommends: python-subunit2sql >= 1.8.0 @@ -83,26 +81,28 @@ between the two projects but the actual usage is not exactly the same. %if %{with test} %check export LC_ALL="en_US.UTF8" -# can only test in python3: cliff unavailable elsewhere -python3 -B -m pytest stestr/tests -v -k 'not test_empty_with_pretty_out' +%pytest stestr/tests -v -k 'not test_empty_with_pretty_out' %endif %if ! %{with test} %build -export LC_ALL="en_US.UTF8" %pyproject_wheel %install -export LC_ALL="en_US.UTF8" %pyproject_install +%python_clone -a %{buildroot}%{_bindir}/stestr %python_expand %fdupes %{buildroot}%{$python_sitelib} +%post +%python_install_alternative stestr + +%postun +%python_uninstall_alternative stestr + %files %{python_files} %license LICENSE %doc ChangeLog README.rst -%if "%{python_flavor}" == "python3" || "%{?python_provides}" == "python3" -%{_bindir}/stestr -%endif +%python_alternative %{_bindir}/stestr %{python_sitelib}/stestr %{python_sitelib}/stestr-%{version}.dist-info %endif