From 47fe51e314b3bae3bd2fa3560e519d76bbbed856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ga=C5=82da?= Date: Fri, 8 Nov 2024 13:44:35 +0100 Subject: [PATCH] ci: Change order of input requirements files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Order of input files matter in pip-compile-cross-platform. The latter file has higher priority and overrides version of package set in former file. Signed-off-by: Jan Gałda --- .github/workflows/validate-pip-requirements-fixed-file.yml | 4 ++-- scripts/requirements-ci.txt | 2 +- scripts/requirements-fixed.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validate-pip-requirements-fixed-file.yml b/.github/workflows/validate-pip-requirements-fixed-file.yml index 337a2de8d75..1645d72fdde 100644 --- a/.github/workflows/validate-pip-requirements-fixed-file.yml +++ b/.github/workflows/validate-pip-requirements-fixed-file.yml @@ -65,11 +65,11 @@ jobs: pip-compile-cross-platform==1.4.2+nordic.2 --upgrade > /dev/null 2>&1 pip-compile-cross-platform \ bootloader/mcuboot/scripts/requirements.txt \ + zephyr/scripts/requirements.txt \ + nrf/scripts/requirements-west-ncs-sbom.txt \ nrf/scripts/requirements-ci.txt \ nrf/scripts/requirements-extra.txt \ nrf/scripts/requirements.txt \ - zephyr/scripts/requirements.txt \ - nrf/scripts/requirements-west-ncs-sbom.txt \ --output-file nrf/scripts/requirements-fixed.txt \ --min-python-version 3.10 diff --git a/scripts/requirements-ci.txt b/scripts/requirements-ci.txt index 271a227bebc..749a98bdfd4 100644 --- a/scripts/requirements-ci.txt +++ b/scripts/requirements-ci.txt @@ -2,7 +2,7 @@ aenum bitarray chardet gitlint==0.19.1 -GitPython==3.1.41 +GitPython jsonschema milksnake py diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index c0098eb894c..d066ea243bf 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile-cross-platform # To update, run: # -# pip-compile-cross-platform bootloader/mcuboot/scripts/requirements.txt nrf/scripts/requirements-ci.txt nrf/scripts/requirements-extra.txt nrf/scripts/requirements.txt zephyr/scripts/requirements.txt nrf/scripts/requirements-west-ncs-sbom.txt --output-file nrf/scripts/requirements-fixed.txt --min-python-version 3.10 +# pip-compile-cross-platform bootloader/mcuboot/scripts/requirements.txt zephyr/scripts/requirements.txt nrf/scripts/requirements-west-ncs-sbom.txt nrf/scripts/requirements-ci.txt nrf/scripts/requirements-extra.txt nrf/scripts/requirements.txt --output-file nrf/scripts/requirements-fixed.txt --min-python-version 3.10 # --extra-index-url https://files.nordicsemi.com/artifactory/api/pypi/nordic-pypi/simple