From b86f25d7bfe3ece162403c97ef65e6dfbec05d1d0d0d95344eb6f0b698af89e9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 30 Sep 2022 11:54:53 +0000 Subject: [PATCH 1/2] - use the python_exec to bootstrap so that the primary interpeter is used OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flit-core?expand=0&rev=30 --- python-flit-core.changes | 6 ++++++ python-flit-core.spec | 19 +++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/python-flit-core.changes b/python-flit-core.changes index 9c80c93..ab9389c 100644 --- a/python-flit-core.changes +++ b/python-flit-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 30 11:52:39 UTC 2022 - Dirk Müller + +- use the python_exec to bootstrap so that the primary interpeter + is used + ------------------------------------------------------------------- Tue Aug 2 19:03:15 UTC 2022 - Ben Greiner diff --git a/python-flit-core.spec b/python-flit-core.spec index e63eb08..60ada89 100644 --- a/python-flit-core.spec +++ b/python-flit-core.spec @@ -30,12 +30,12 @@ # The rest is in Ring1 %define pprefix python %if 0%{?suse_version} >= 1550 || 0%{?sle_version} == 150500 -%{expand:%%define skip_%{primary_python} 1} BuildRequires: python3-base >= 3.6 +%{expand:%%define skip_%{primary_python} 1} %else +%define python_module() no-build-without-multibuild-flavor # no non-primary python in <=15.4 ExclusiveArch: do-not-build -%define python_module() no-build-without-multibuild-flavor %endif %endif %if "%{flavor}" == "test" @@ -45,30 +45,29 @@ ExclusiveArch: do-not-build %else %bcond_with test %endif - Name: %{pprefix}-flit-core%{?psuffix} Version: 3.7.1 Release: 0 Summary: Distribution-building parts of Flit License: BSD-3-Clause AND MIT URL: https://github.com/pypa/flit -Source0: https://files.pythonhosted.org/packages/source/f/flit-core/flit_core-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/f/flit_core/flit_core-%{version}.tar.gz BuildRequires: %{python_module base >= 3.6} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildArch: noarch %if %{with test} BuildRequires: %{python_module flit-core = %{version}} BuildRequires: %{python_module pytest} BuildRequires: %{python_module testpath} %endif -BuildRequires: fdupes -BuildRequires: python-rpm-macros -BuildArch: noarch # SECTION boo#1186870: we are a transitive build dependency of python-packaging which is used by pythondistdeps.py normally creating this entry -#!BuildIgnore: python3-packaging #!BuildIgnore: %{primary_python}-packaging +#!BuildIgnore: python3-packaging Provides: %{mypython}%{python_version}dist(%{modname}) = %{version} %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" -Provides: %{mypython}3dist(%{modname}) = %{version} Provides: %{mypython}3-%{modname} = %{version}-%{release} +Provides: %{mypython}3dist(%{modname}) = %{version} Obsoletes: %{mypython}3-%{modname} < %{version}-%{release} %endif # /SECTION @@ -84,7 +83,7 @@ The only public interface is the API specified by PEP 517, at flit_core.buildapi %if !%{with test} %build # https://flit.readthedocs.io/en/latest/bootstrap.html -python3 -m flit_core.wheel +%python_exec -m flit_core.wheel %install %{python_expand # From fe0daf1ce39efba971a138e605c03c270b88604efed1e9a2bf6798ba17031495 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 11 Oct 2022 19:20:14 +0000 Subject: [PATCH 2/2] Accepting request 1008770 from home:bnavigator:branches:devel:languages:python - Make sure the 15.4 tests also have python3-packaging - Revert python_exec change, one pure wheel built by python3 is enough OBS-URL: https://build.opensuse.org/request/show/1008770 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flit-core?expand=0&rev=31 --- python-flit-core.changes | 7 +++++++ python-flit-core.spec | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python-flit-core.changes b/python-flit-core.changes index ab9389c..cf0b5fb 100644 --- a/python-flit-core.changes +++ b/python-flit-core.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 7 12:16:47 UTC 2022 - Ben Greiner + +- Make sure the 15.4 tests also have python3-packaging +- Revert python_exec change, one pure wheel built by python3 is + enough + ------------------------------------------------------------------- Fri Sep 30 11:52:39 UTC 2022 - Dirk Müller diff --git a/python-flit-core.spec b/python-flit-core.spec index 60ada89..bc51fdb 100644 --- a/python-flit-core.spec +++ b/python-flit-core.spec @@ -58,12 +58,14 @@ BuildRequires: python-rpm-macros BuildArch: noarch %if %{with test} BuildRequires: %{python_module flit-core = %{version}} +BuildRequires: %{python_module packaging} BuildRequires: %{python_module pytest} BuildRequires: %{python_module testpath} -%endif +%else # SECTION boo#1186870: we are a transitive build dependency of python-packaging which is used by pythondistdeps.py normally creating this entry #!BuildIgnore: %{primary_python}-packaging #!BuildIgnore: python3-packaging +%endif Provides: %{mypython}%{python_version}dist(%{modname}) = %{version} %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" Provides: %{mypython}3-%{modname} = %{version}-%{release} @@ -83,7 +85,7 @@ The only public interface is the API specified by PEP 517, at flit_core.buildapi %if !%{with test} %build # https://flit.readthedocs.io/en/latest/bootstrap.html -%python_exec -m flit_core.wheel +python3 -m flit_core.wheel %install %{python_expand #