From d4e3ef0b0ae95406b5c235c06ae8d4b80efdb6c5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 5 Jul 2026 13:32:18 -0600 Subject: CI: Install pylibfdt's requirements in the tool jobs The GitLab and Azure tool-test and pylint jobs build the pylibfdt bindings, which need setuptools. That currently comes only from patman's requirements.txt, which a later patch drops. Install scripts/dtc/pylibfdt/requirements.txt in those jobs, the proper source for that dependency, so setuptools survives patman's removal. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- .azure-pipelines.yml | 4 +++- .gitlab-ci.yml | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 4417ef4e5a5..d650f0acbc7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -164,7 +164,8 @@ stages: -r tools/binman/requirements.txt \ -r tools/buildman/requirements.txt \ -r tools/patman/requirements.txt \ - -r tools/u_boot_pylib/requirements.txt + -r tools/u_boot_pylib/requirements.txt \ + -r scripts/dtc/pylibfdt/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} @@ -198,6 +199,7 @@ stages: -r tools/buildman/requirements.txt \ -r tools/patman/requirements.txt \ -r tools/u_boot_pylib/requirements.txt \ + -r scripts/dtc/pylibfdt/requirements.txt \ asteval pylint==3.3.4 pyopenssl export PATH=${PATH}:~/.local/bin echo "[MASTER]" >> .pylintrc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 245e422d72f..6d9b78f5060 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,8 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/patman/requirements.txt - -r tools/u_boot_pylib/requirements.txt; + -r tools/u_boot_pylib/requirements.txt + -r scripts/dtc/pylibfdt/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; @@ -245,7 +246,8 @@ Run pylint: - . /tmp/venv/bin/activate - pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/patman/requirements.txt - -r tools/u_boot_pylib/requirements.txt asteval pylint==3.3.4 pyopenssl + -r tools/u_boot_pylib/requirements.txt + -r scripts/dtc/pylibfdt/requirements.txt asteval pylint==3.3.4 pyopenssl - export PATH=${PATH}:~/.local/bin - echo "[MASTER]" >> .pylintrc - echo "load-plugins=pylint.extensions.docparams" >> .pylintrc -- cgit v1.3.1