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 <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -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
|
||||
|
||||
+4
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user