From 3dfcc85c7719561dba3fdc5296d050da191906c7 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Mon, 28 Oct 2024 18:58:18 +0100 Subject: [PATCH 1/2] fixed --- .github/workflows/ci-testing-deploy.yml | 58 ++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index 54d0b2d5876..a95d469c0a6 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -336,7 +336,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/web/server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install webserver @@ -387,7 +387,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/web/server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install webserver @@ -432,7 +432,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/web/server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install webserver @@ -477,7 +477,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/storage/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -527,7 +527,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/agent/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -575,7 +575,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "api/requirements.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install api @@ -620,7 +620,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/api-server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -671,7 +671,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/autoscaling/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -719,7 +719,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/catalog/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -773,7 +773,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/clusters-keeper/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -832,7 +832,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/datcore-adapter/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -928,7 +928,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/director-v2/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -982,7 +982,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/aws-library/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1030,7 +1030,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/dastk-task-models-library/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1078,7 +1078,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/dask-sidecar/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1126,7 +1126,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/osparc-gateway-server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1184,7 +1184,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/payments/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1232,7 +1232,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/dynamic-scheduler/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1280,7 +1280,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/resource-usage-tracker/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1338,7 +1338,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/dynamic-sidecar/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1386,7 +1386,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/efs-guardian/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1480,7 +1480,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/postgres-database/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1528,7 +1528,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/notifications-library/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1576,7 +1576,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/service-integration/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1624,7 +1624,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/service-library/requirements/ci*.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1672,7 +1672,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/settings-library/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1720,7 +1720,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/models-library/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1771,7 +1771,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/notifications-library/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1821,7 +1821,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/simcore-sdk/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install From 8bc0f9efb0ed85fcc402f9168b684fd2aea8c13d Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:42:03 +0100 Subject: [PATCH 2/2] done --- .github/workflows/ci-testing-deploy.yml | 26 +++++++++---------- .../unit-testing/notifications-library.bash | 1 - ci/github/unit-testing/python-linting.bash | 3 +-- ci/helpers/install_pylint.bash | 1 + 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index a95d469c0a6..6baab2e30f4 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -1445,7 +1445,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/ci/helpers/requirements.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1929,7 +1929,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/web/server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -1992,7 +1992,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/web/server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2055,7 +2055,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/director-v2/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2122,7 +2122,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/director-v2/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2187,7 +2187,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/dynamic-sidecar/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2251,7 +2251,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/osparc-gateway-server/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2328,7 +2328,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/simcore-sdk/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2415,7 +2415,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/public-api/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2475,7 +2475,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/swarm-deploy/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install @@ -2546,7 +2546,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/e2e/requirements/requirements.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: setup @@ -2609,7 +2609,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/e2e-playwright/requirements/ci.txt" - name: expose github runtime for buildx uses: crazy-max/ghaction-github-runtime@v3 - name: download docker images @@ -2671,7 +2671,7 @@ jobs: with: version: "0.4.x" enable-cache: true - cache-dependency-glob: "" + cache-dependency-glob: "**/environment-setup/requirements/ci.txt" - name: show system version run: ./ci/helpers/show_system_versions.bash - name: install diff --git a/ci/github/unit-testing/notifications-library.bash b/ci/github/unit-testing/notifications-library.bash index 6cfbd845284..acbeba7d0f6 100755 --- a/ci/github/unit-testing/notifications-library.bash +++ b/ci/github/unit-testing/notifications-library.bash @@ -6,7 +6,6 @@ set -o pipefail # don't hide errors within pipes IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip.bash make devenv # shellcheck source=/dev/null source .venv/bin/activate diff --git a/ci/github/unit-testing/python-linting.bash b/ci/github/unit-testing/python-linting.bash index 52471469354..b810efa5896 100755 --- a/ci/github/unit-testing/python-linting.bash +++ b/ci/github/unit-testing/python-linting.bash @@ -9,9 +9,8 @@ install() { make devenv # shellcheck source=/dev/null source .venv/bin/activate - bash ci/helpers/ensure_python_pip.bash bash ci/helpers/install_pylint.bash - pip freeze + uv pip freeze } test() { diff --git a/ci/helpers/install_pylint.bash b/ci/helpers/install_pylint.bash index 4abdf8786f6..46160a8e17c 100755 --- a/ci/helpers/install_pylint.bash +++ b/ci/helpers/install_pylint.bash @@ -16,6 +16,7 @@ PYLINT_VERSION="$(grep pylint== $REQUIREMENTS | awk '{print $1}')" uv pip install "$PYLINT_VERSION" # Minimal packages to pass linter +echo "$CURDIR/requirements.txt" uv pip install -r "$CURDIR/requirements.txt" echo "INFO:" "$(pylint --version)" "@" "$(command -v pylint)"