Fix pip installs

dfinity · Oct 9, 2024 · 15cd7e3 · 15cd7e3
1 parent 69581ce
commit 15cd7e3
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml
@@ -229,7 +229,7 @@ jobs:
         run: |
           set -xeuo pipefail
           export PYTHONPATH=$PWD/ci/src:$PWD/ci/src/dependencies
-          pip3 install --ignore-installed -r requirements.txt
+          PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --ignore-installed -r requirements.txt
           cd ci/src
           pytest -m "not fails_on_merge_train" -v -o junit_family=xunit1 \
             --junitxml=../../test_report.xml --cov=. --cov-report=term \

diff --git a/.github/workflows-source/ci-pr-only.yml b/.github/workflows-source/ci-pr-only.yml
@@ -148,7 +148,7 @@ jobs:
         id: setup-python-deps
         shell: bash
         run: |
-          pip3 install --ignore-installed -r requirements.txt
+          PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --ignore-installed -r requirements.txt
       - name: Dependency Scan for Pull Request
         id: dependencies-check
         shell: bash

diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml
@@ -152,7 +152,7 @@ jobs:
         id: setup-python-deps
         shell: bash
         run: |
-          pip3 install --ignore-installed -r requirements.txt
+          PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --ignore-installed -r requirements.txt
       - name: Dependency Scan for Release
         id: dependency-scan-release-cut
         shell: bash

diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml
@@ -198,7 +198,7 @@ jobs:
         id: setup-environment-deps
         shell: bash
         run: |
-          pip3 install --ignore-installed -r requirements.txt
+          PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --ignore-installed -r requirements.txt
           cargo install wasm-pack --version "${CARGO_WASMPACK_VERSION}"
           source "${NVM_DIR}/nvm.sh"
           nvm use ${DEFAULT_NODE_VERSION}

diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -298,7 +298,7 @@ jobs:
         run: |
           set -xeuo pipefail
           export PYTHONPATH=$PWD/ci/src:$PWD/ci/src/dependencies
-          pip3 install --ignore-installed -r requirements.txt
+          PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --ignore-installed -r requirements.txt
           cd ci/src
           pytest -m "not fails_on_merge_train" -v -o junit_family=xunit1 \
             --junitxml=../../test_report.xml --cov=. --cov-report=term \

diff --git a/.github/workflows/ci-pr-only.yml b/.github/workflows/ci-pr-only.yml
@@ -151,7 +151,7 @@ jobs:
         id: setup-python-deps
         shell: bash
         run: |
-          pip3 install --ignore-installed -r requirements.txt
+          PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --ignore-installed -r requirements.txt
       - name: Dependency Scan for Pull Request
         id: dependencies-check
         shell: bash

diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml
@@ -253,7 +253,7 @@ jobs:
         id: setup-environment-deps
         shell: bash
         run: |
-          pip3 install --ignore-installed -r requirements.txt
+          PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --ignore-installed -r requirements.txt
           cargo install wasm-pack --version "${CARGO_WASMPACK_VERSION}"
           source "${NVM_DIR}/nvm.sh"
           nvm use ${DEFAULT_NODE_VERSION}

diff --git a/ci/src/dependencies/scanner/manager/bazel_rust_dependency_manager.py b/ci/src/dependencies/scanner/manager/bazel_rust_dependency_manager.py
@@ -110,8 +110,11 @@ def __transitive_bazel_string_to_dependency(bazel_string: str) -> typing.Optiona
             # ['zstd', 'sys', '2.0.2', 'zstd.1.5.2']
             for split_string in parse_result:
                 # 2.0.2
-                if isinstance(version.parse(split_string), version.Version):
-                    version_str = split_string
+                try:
+                    if isinstance(version.parse(split_string), version.Version):
+                        version_str = split_string
+                except version.InvalidVersion:
+                    continue
             # split with -2.0.2
             # noinspection PyUnboundLocalVariable
             name = result[0].split(f"-{version_str}", 1)[0]