osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/41391?usp=email )
Change subject: gen_makefile: python: run build in venv too
......................................................................
gen_makefile: python: run build in venv too
The format of the license field in pyproject.toml was changed from a
"table" to a a string with an SPDX license expression. The pyosmocom
sources have been adjusted to use the new format to appease a warning
("By 2026-Feb-18, you need to update your project and remove deprecated
calls or your builds will no longer be supported."). However now the
build fails with older setuptools versions.
Run the build of python packages in the venv too, to ensure we have a
recent setuptools version.
Related: pyosmocom I8416234ea02f337fabd075cc345af964c1b71adf
Related: osmo-ci Ia8ef3a0301aeaad4691c197ed780e86b497def4a
Related:
https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license-and-license-files
Change-Id: Idbd826d65267c05dcf2d82f7429d53a52686d737
---
M gen_makefile.py
M python-venv-requirements.txt
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/gen_makefile.py b/gen_makefile.py
index cfc681b..4ee5290 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -435,7 +435,7 @@
.make.{proj}.build: .make.{proj}.configure .make.{proj}.clone $({proj}_files)
@echo "\\n\\n\\n===== $@\\n"
rm -f {build_proj}/*.whl
- python3 \
+ {gen_venv_activate()} && python3 \
-m build \
--no-isolation \
{src_proj} \
diff --git a/python-venv-requirements.txt b/python-venv-requirements.txt
index 2f5ab59..2e8bb5d 100644
--- a/python-venv-requirements.txt
+++ b/python-venv-requirements.txt
@@ -21,3 +21,8 @@
redis==5.0.0
tzlocal==4.3
xmltodict==0.14.2
+
+setuptools>=77.0.0
+build
+poetry
+wheel
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41391?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Idbd826d65267c05dcf2d82f7429d53a52686d737
Gerrit-Change-Number: 41391
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
