From 40daec3d157bf1743dafdcf26738ed0a1c421a2e64d64d74e06aded4ec646e6d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 18 Jun 2021 08:53:40 +0000 Subject: [PATCH] Accepting request 900652 from home:bnavigator:branches:devel:languages:python - Add Provides: for python*dist(packaging): work around boo#1186870 - skip tests failing because of no-legacyversion-warning.patch OBS-URL: https://build.opensuse.org/request/show/900652 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-packaging?expand=0&rev=49 --- python-packaging.changes | 6 ++++++ python-packaging.spec | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/python-packaging.changes b/python-packaging.changes index 76c97ae..797944f 100644 --- a/python-packaging.changes +++ b/python-packaging.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 17 17:28:43 UTC 2021 - Ben Greiner + +- Add Provides: for python*dist(packaging): work around boo#1186870 +- skip tests failing because of no-legacyversion-warning.patch + ------------------------------------------------------------------- Sat May 1 21:03:52 UTC 2021 - Dirk Müller diff --git a/python-packaging.spec b/python-packaging.spec index 963ec54..76317c9 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,5 +1,5 @@ # -# spec file for package python-packaging-test +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -25,6 +25,8 @@ %define psuffix %{nil} %bcond_with test %endif +# in order to avoid rewriting for subpackage generator +%define mypython python Name: python-packaging%{psuffix} Version: 20.9 Release: 0 @@ -50,6 +52,11 @@ BuildRequires: %{python_module pretend} BuildRequires: %{python_module pyparsing >= 2.0.2} BuildRequires: %{python_module pytest} %endif +# work around boo#1186870 +Provides: %{mypython}%{python_version}dist(packaging) = %{version}-%{release} +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +Provides: %{mypython}3dist(packaging) = %{version}-%{release} +%endif %python_subpackages %description @@ -66,7 +73,9 @@ test -d packaging.egg-info %if %{with test} %check -%pytest +# no-legacyversion-warning.patch causes these to fail +%pytest -k "not (test_legacy_specifier_is_deprecated or test_legacy_version_is_deprecated)" + %endif # %%{with_test} %if !%{with test}