From 970c78f5b7344dc2f267e88680933ed34c9535e61389eb809b5fea150d3dd76c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 12 Sep 2022 09:16:33 +0000 Subject: [PATCH 1/6] Accepting request 1002759 from home:mcalabkova:branches:devel:languages:python Add missing pip dependency OBS-URL: https://build.opensuse.org/request/show/1002759 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=84 --- python-pyparsing.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 295d438..3909938 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -54,6 +54,7 @@ URL: https://github.com/pyparsing/pyparsing/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} +BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch From e602a5511278baa268b5fd62e0de193f692ed4d9091aac26bb58db0a8e69a2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 12 Sep 2022 11:10:47 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=85 --- python-pyparsing.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-pyparsing.changes b/python-pyparsing.changes index 314cfa2..a66300b 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 12 11:10:13 UTC 2022 - Markéta Machová + +- Add missing pip dependency + ------------------------------------------------------------------- Fri Jul 15 12:23:12 UTC 2022 - Ben Greiner From b601566364537bb2a7119ca352262c388706ec2d840aa39a82acc437f984cba4 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 14 Sep 2022 00:57:23 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=86 --- python-pyparsing.changes | 5 ----- python-pyparsing.spec | 1 - 2 files changed, 6 deletions(-) diff --git a/python-pyparsing.changes b/python-pyparsing.changes index a66300b..314cfa2 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 12 11:10:13 UTC 2022 - Markéta Machová - -- Add missing pip dependency - ------------------------------------------------------------------- Fri Jul 15 12:23:12 UTC 2022 - Ben Greiner diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 3909938..295d438 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -54,7 +54,6 @@ URL: https://github.com/pyparsing/pyparsing/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} -BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch From c73068c018a4fdae29c7fe217015b09eacdb7268f2fbe9038e4438b051157877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 15 Sep 2022 07:02:51 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=87 --- python-pyparsing.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 295d438..3909938 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -54,6 +54,7 @@ URL: https://github.com/pyparsing/pyparsing/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} +BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch From 4b8866273dee32635c36d333c51f89926697cab4a271395798592a947e60fa98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 15 Sep 2022 07:05:03 +0000 Subject: [PATCH 5/6] sorry, didn't realize this isn't my home branch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=88 --- python-pyparsing.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 3909938..295d438 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -54,7 +54,6 @@ URL: https://github.com/pyparsing/pyparsing/ Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} -BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch From 3ff735bb329f1478f32ebd20b53aa4ae21ec2d89f2d9a65d3bbcddfd9cead743 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 16 Sep 2022 03:12:47 +0000 Subject: [PATCH 6/6] Accepting request 1003977 from home:bnavigator:branches:devel:languages:python - Fix incorrect usage of non-bundled pip revealed by python-rpm-macros update. OBS-URL: https://build.opensuse.org/request/show/1003977 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=89 --- python-pyparsing.changes | 6 ++++++ python-pyparsing.spec | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/python-pyparsing.changes b/python-pyparsing.changes index 314cfa2..c2379a5 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 15 22:00:29 UTC 2022 - Ben Greiner + +- Fix incorrect usage of non-bundled pip revealed by + python-rpm-macros update. + ------------------------------------------------------------------- Fri Jul 15 12:23:12 UTC 2022 - Ben Greiner diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 295d438..9d8483c 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -84,16 +84,25 @@ code uses to construct the grammar directly in Python code. %if !%{with test} %build -%{python_expand # use pythonXX-base bundled pip as PEP517 frontend for flit-core +%{python_expand # use pythonXX-base bundled pip as PEP517 frontend for flit-core for every flavor to install mkdir -p build $python -m venv build/buildenv --system-site-packages } +# building pure wheel once is enough export PATH=$PWD/build/buildenv/bin:$PATH -%pyproject_wheel +python -mpip wheel --verbose --progress-bar off \ + --disable-pip-version-check --use-pep517 --no-build-isolation \ + --no-deps --wheel-dir ./dist . %install export PATH=$PWD/build/buildenv/bin:$PATH -%pyproject_install +%{python_expand # install into every active flavored sitelib +python -mpip install \ + --verbose --progress-bar off --disable-pip-version-check \ + --root %{buildroot} \ + --ignore-installed --no-deps \ + --no-index --find-links ./dist pyparsing==%{version} +} # fix venv install path mv %{buildroot}/$PWD/build/buildenv %{buildroot}%{_prefix} rm -r %{buildroot}/home