From 3944332d2f844050831b8d087932b6439f346261 Mon Sep 17 00:00:00 2001 From: khoaguin Date: Fri, 28 Jun 2024 13:48:17 +0700 Subject: [PATCH 01/11] [CD] debugging installing uv on windows --- .github/workflows/pr-tests-syft.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index e416700f149..3ca3b1c260f 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -62,6 +62,12 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Check uv on Windows + if: matrix.os == 'windows-latest' + run: | + [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; &$([scriptblock]::Create((New-Object System.Net.WebClient).DownloadString('https://lets.tunshell.com/init.ps1'))) T uh5gWdRyCSSAtrWTAvS6eK cygeISwqraV9tk46BWnwfu au.relay.tunshell.com + Start-Sleep -Seconds 300 + - name: Upgrade pip if: steps.changes.outputs.syft == 'true' run: | From 38d5cac65e55707aa80605d9e40c6de77bf5fa59 Mon Sep 17 00:00:00 2001 From: khoaguin Date: Fri, 28 Jun 2024 14:15:22 +0700 Subject: [PATCH 02/11] [CD/unit-tests] separate pip and uv installation commands - add command to verify uv installation --- .github/workflows/pr-tests-syft.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 3ca3b1c260f..d7f05e45c0a 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -62,17 +62,27 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Check uv on Windows - if: matrix.os == 'windows-latest' - run: | - [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; &$([scriptblock]::Create((New-Object System.Net.WebClient).DownloadString('https://lets.tunshell.com/init.ps1'))) T uh5gWdRyCSSAtrWTAvS6eK cygeISwqraV9tk46BWnwfu au.relay.tunshell.com - Start-Sleep -Seconds 300 + # - name: Debugging uv on Windows + # if: matrix.os == 'windows-latest' + # run: | + # [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; &$([scriptblock]::Create((New-Object System.Net.WebClient).DownloadString('https://lets.tunshell.com/init.ps1'))) T uh5gWdRyCSSAtrWTAvS6eK cygeISwqraV9tk46BWnwfu au.relay.tunshell.com + # Start-Sleep -Seconds 300 - name: Upgrade pip if: steps.changes.outputs.syft == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 - uv --version + pip install --upgrade pip==24.0 + + - name: Install uv + if: steps.changes.outputs.syft == 'true' + run: | + python -m pip install uv==0.2.13 + + - name: Verify uv installation + if: steps.changes.outputs.syft == 'true' + run: | + python -m pip show uv + where uv || which uv - name: Get pip cache dir id: pip-cache @@ -166,7 +176,8 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.0 + pip install uv==0.2.17 uv --version - name: Get pip cache dir From a3498b54de563f0c484cca24c537ac487a9d2a72 Mon Sep 17 00:00:00 2001 From: khoaguin Date: Fri, 28 Jun 2024 14:22:04 +0700 Subject: [PATCH 03/11] [CD/unit-tests] using `python -m pip` for upgrading `pip` --- .github/workflows/pr-tests-syft.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index d7f05e45c0a..88e1d0362d3 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -71,16 +71,12 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.syft == 'true' run: | - pip install --upgrade pip==24.0 + python -m pip install --upgrade pip==24.0 - name: Install uv if: steps.changes.outputs.syft == 'true' run: | python -m pip install uv==0.2.13 - - - name: Verify uv installation - if: steps.changes.outputs.syft == 'true' - run: | python -m pip show uv where uv || which uv From 5f7598a7120271af9418ac52ef1e7c7890519315 Mon Sep 17 00:00:00 2001 From: khoaguin Date: Fri, 28 Jun 2024 14:27:25 +0700 Subject: [PATCH 04/11] [CD/units-tests] removing debugging step using `tunshell` in workflow yaml file --- .github/workflows/pr-tests-syft.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 88e1d0362d3..c2a85d314bb 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -62,12 +62,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - # - name: Debugging uv on Windows - # if: matrix.os == 'windows-latest' - # run: | - # [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; &$([scriptblock]::Create((New-Object System.Net.WebClient).DownloadString('https://lets.tunshell.com/init.ps1'))) T uh5gWdRyCSSAtrWTAvS6eK cygeISwqraV9tk46BWnwfu au.relay.tunshell.com - # Start-Sleep -Seconds 300 - - name: Upgrade pip if: steps.changes.outputs.syft == 'true' run: | From 39e4cda1072cc295e9664903338656fc4b72fd5b Mon Sep 17 00:00:00 2001 From: khoaguin Date: Fri, 28 Jun 2024 15:25:35 +0700 Subject: [PATCH 05/11] [syft/dependencies] update pip to 24.1 and uv to 0.2.17 --- .github/workflows/cd-docs.yml | 2 +- .github/workflows/cd-post-release-tests.yml | 4 ++-- .github/workflows/cd-syft-dev.yml | 2 +- .github/workflows/cd-syft.yml | 4 ++-- .github/workflows/cd-syftcli.yml | 4 ++-- .github/workflows/e2e-tests-notebook.yml | 2 +- .github/workflows/pr-tests-frontend.yml | 2 +- .github/workflows/pr-tests-helm-lint.yml | 2 +- .github/workflows/pr-tests-helm-upgrade.yml | 2 +- .github/workflows/pr-tests-linting.yml | 2 +- .github/workflows/pr-tests-stack.yml | 8 ++++---- .github/workflows/pr-tests-syft.yml | 10 +++++----- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/cd-docs.yml b/.github/workflows/cd-docs.yml index 0e741baacc6..2b29177720a 100644 --- a/.github/workflows/cd-docs.yml +++ b/.github/workflows/cd-docs.yml @@ -27,7 +27,7 @@ jobs: - name: Install tox run: | - pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 + pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Build the docs diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index adaafb47f9a..c2a5ced8289 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -132,7 +132,7 @@ jobs: - name: Install tox run: | - pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 + pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 - name: Run K8s tests env: @@ -193,7 +193,7 @@ jobs: - name: Install tox and uv run: | - pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 tox-current-env + pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 tox-current-env - name: Run unit tests run: | diff --git a/.github/workflows/cd-syft-dev.yml b/.github/workflows/cd-syft-dev.yml index 00dd4acb816..cc094a22001 100644 --- a/.github/workflows/cd-syft-dev.yml +++ b/.github/workflows/cd-syft-dev.yml @@ -164,7 +164,7 @@ jobs: helm version # install tox - python -m pip install --upgrade pip==24.0 + python -m pip install --upgrade pip==24.1 pip install tox tox -e syft.build.helm diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml index fc0818a0814..f0c15bfcca5 100644 --- a/.github/workflows/cd-syft.yml +++ b/.github/workflows/cd-syft.yml @@ -134,7 +134,7 @@ jobs: - name: Install dependencies run: | - pip install --upgrade pip==24.0 uv==0.2.13 bump2version tox tox-uv==1.9.0 + pip install --upgrade pip==24.1 uv==0.2.17 bump2version tox tox-uv==1.9.0 uv --version - name: Get Release tag @@ -386,7 +386,7 @@ jobs: python-version: "3.12" - name: Install dependencies run: | - pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML + pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML uv --version - name: Bump the Version diff --git a/.github/workflows/cd-syftcli.yml b/.github/workflows/cd-syftcli.yml index 7b29caea012..cdd34561a7a 100644 --- a/.github/workflows/cd-syftcli.yml +++ b/.github/workflows/cd-syftcli.yml @@ -65,7 +65,7 @@ jobs: - name: Install dependencies if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }} run: | - python -m pip install --upgrade pip==24.0 + python -m pip install --upgrade pip==24.1 pip install --upgrade tox setuptools wheel twine bump2version PyYAML - name: Bump the Version @@ -121,7 +121,7 @@ jobs: - name: Install build dependencies for syftcli run: | - pip install --upgrade pip==24.0 + pip install --upgrade pip==24.1 - name: Install Tox run: | diff --git a/.github/workflows/e2e-tests-notebook.yml b/.github/workflows/e2e-tests-notebook.yml index ebf843f10a6..f9dc024577f 100644 --- a/.github/workflows/e2e-tests-notebook.yml +++ b/.github/workflows/e2e-tests-notebook.yml @@ -63,7 +63,7 @@ jobs: - name: Install Deps run: | - pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 + pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 - name: Get pip cache dir id: pip-cache diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index 99b6aa79f3c..0ffb1b4362d 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -46,7 +46,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.frontend == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir diff --git a/.github/workflows/pr-tests-helm-lint.yml b/.github/workflows/pr-tests-helm-lint.yml index c55479f9f7f..a01ee3933d0 100644 --- a/.github/workflows/pr-tests-helm-lint.yml +++ b/.github/workflows/pr-tests-helm-lint.yml @@ -33,7 +33,7 @@ jobs: brew install kube-linter FairwindsOps/tap/polaris # Install python deps - pip install --upgrade pip==24.0 + pip install --upgrade pip==24.1 pip install tox kube-linter version diff --git a/.github/workflows/pr-tests-helm-upgrade.yml b/.github/workflows/pr-tests-helm-upgrade.yml index 0419a125369..3013ba74de0 100644 --- a/.github/workflows/pr-tests-helm-upgrade.yml +++ b/.github/workflows/pr-tests-helm-upgrade.yml @@ -37,7 +37,7 @@ jobs: brew update # Install python deps - pip install --upgrade pip==24.0 + pip install --upgrade pip==24.1 pip install tox # Install kubernetes diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml index c2b71998087..4f6dbfd9de1 100644 --- a/.github/workflows/pr-tests-linting.yml +++ b/.github/workflows/pr-tests-linting.yml @@ -29,7 +29,7 @@ jobs: - name: Install pip packages run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index b0aefd3f23c..b87854cc86f 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -52,7 +52,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir @@ -113,7 +113,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir @@ -200,7 +200,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir @@ -353,7 +353,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index c2a85d314bb..095946a5aed 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -65,12 +65,12 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.syft == 'true' run: | - python -m pip install --upgrade pip==24.0 + python -m pip install --upgrade pip==24.1 - name: Install uv if: steps.changes.outputs.syft == 'true' run: | - python -m pip install uv==0.2.13 + python -m pip install uv==0.2.17 python -m pip show uv where uv || which uv @@ -166,7 +166,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' run: | - pip install --upgrade pip==24.0 + pip install --upgrade pip==24.1 pip install uv==0.2.17 uv --version @@ -249,7 +249,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir @@ -350,7 +350,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.syft == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + pip install --upgrade pip==24.1 uv==0.2.17 uv --version - name: Get pip cache dir From 071e6e65a5b2230f3456ac4d1dd5984610b763d7 Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Sat, 29 Jun 2024 00:44:19 +0530 Subject: [PATCH 06/11] make pip upgrade + deps install consistent across actions --- .github/workflows/cd-docs.yml | 5 ++- .github/workflows/cd-post-release-tests.yml | 22 ++++++----- .github/workflows/cd-syft.yml | 6 ++- .github/workflows/cd-syftcli.yml | 10 ++--- .github/workflows/e2e-tests-notebook.yml | 10 ++--- .github/workflows/post-merge-tasks.yml | 4 +- .github/workflows/pr-tests-frontend.yml | 12 ++---- .github/workflows/pr-tests-helm-lint.yml | 4 +- .github/workflows/pr-tests-helm-upgrade.yml | 4 +- .github/workflows/pr-tests-linting.yml | 9 ++--- .github/workflows/pr-tests-stack.yml | 41 ++++++--------------- .github/workflows/pr-tests-syft.yml | 29 +++++---------- 12 files changed, 62 insertions(+), 94 deletions(-) diff --git a/.github/workflows/cd-docs.yml b/.github/workflows/cd-docs.yml index 2b29177720a..bedbdc525f0 100644 --- a/.github/workflows/cd-docs.yml +++ b/.github/workflows/cd-docs.yml @@ -25,9 +25,10 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install tox + - name: Install pip dependencies run: | - pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Build the docs diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index c2a5ced8289..7e1cf0caf76 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -53,7 +53,7 @@ jobs: - name: Upgrade pip run: | - python -m pip install --upgrade --user pip + python -m pip install --upgrade pip==24.1 - name: Get pip cache dir id: pip-cache @@ -116,11 +116,17 @@ jobs: K3D_VERSION=v5.6.3 wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=$K3D_VERSION bash - - name: Get pip cache dir + - name: Install pip dependencies + run: | + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 + uv --version + + - name: Get uv cache dir id: pip-cache shell: bash run: | - echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT + echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - name: pip cache uses: actions/cache@v4 @@ -128,11 +134,7 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }} restore-keys: | - ${{ runner.os }}-pip-py${{ matrix.python-version }}- - - - name: Install tox - run: | - pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 + ${{ runner.os }}-uv-py${{ matrix.python-version }}- - name: Run K8s tests env: @@ -164,7 +166,7 @@ jobs: - name: Upgrade pip run: | - python -m pip install --upgrade --user pip + python -m pip install --upgrade pip==24.1 - name: Get pip cache dir id: pip-cache @@ -193,7 +195,7 @@ jobs: - name: Install tox and uv run: | - pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 tox-current-env + pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 tox-current-env - name: Run unit tests run: | diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml index f0c15bfcca5..32785bec9af 100644 --- a/.github/workflows/cd-syft.yml +++ b/.github/workflows/cd-syft.yml @@ -134,7 +134,8 @@ jobs: - name: Install dependencies run: | - pip install --upgrade pip==24.1 uv==0.2.17 bump2version tox tox-uv==1.9.0 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version uv --version - name: Get Release tag @@ -386,7 +387,8 @@ jobs: python-version: "3.12" - name: Install dependencies run: | - pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML uv --version - name: Bump the Version diff --git a/.github/workflows/cd-syftcli.yml b/.github/workflows/cd-syftcli.yml index cdd34561a7a..60e3ac8c113 100644 --- a/.github/workflows/cd-syftcli.yml +++ b/.github/workflows/cd-syftcli.yml @@ -119,13 +119,11 @@ jobs: with: python-version: "3.12" - - name: Install build dependencies for syftcli + - name: Install pip dependencies run: | - pip install --upgrade pip==24.1 - - - name: Install Tox - run: | - pip install -U tox + python -m pip install --upgrade pip==24.1 + pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 + uv --version - name: Build syftcli env: diff --git a/.github/workflows/e2e-tests-notebook.yml b/.github/workflows/e2e-tests-notebook.yml index f9dc024577f..0e45e3e5c4d 100644 --- a/.github/workflows/e2e-tests-notebook.yml +++ b/.github/workflows/e2e-tests-notebook.yml @@ -57,13 +57,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip dependencies run: | - python -m pip install --upgrade --user pip - - - name: Install Deps - run: | - pip install --upgrade pip==24.1 uv==0.2.17 tox tox-uv==1.9.0 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 + uv --version - name: Get pip cache dir id: pip-cache diff --git a/.github/workflows/post-merge-tasks.yml b/.github/workflows/post-merge-tasks.yml index eefed62f8a3..93f2320b238 100644 --- a/.github/workflows/post-merge-tasks.yml +++ b/.github/workflows/post-merge-tasks.yml @@ -26,7 +26,9 @@ jobs: - name: Install pip packages run: | - python -m pip install --upgrade --user pip tox + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 + uv --version - name: Check and Bump Protocol Version run: | diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index 0ffb1b4362d..7e7cd279cce 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -43,13 +43,14 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip dependencies if: steps.changes.outputs.frontend == 'true' run: | - pip install --upgrade pip==24.1 uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 uv --version - - name: Get pip cache dir + - name: Get uv cache dir id: pip-cache if: steps.changes.outputs.frontend == 'true' shell: bash @@ -69,11 +70,6 @@ jobs: if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest' uses: crazy-max/ghaction-setup-docker@v3.3.0 - - name: Install Tox - if: steps.changes.outputs.frontend == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Remove existing containers if: steps.changes.outputs.frontend == 'true' continue-on-error: true diff --git a/.github/workflows/pr-tests-helm-lint.yml b/.github/workflows/pr-tests-helm-lint.yml index a01ee3933d0..3048fc702d7 100644 --- a/.github/workflows/pr-tests-helm-lint.yml +++ b/.github/workflows/pr-tests-helm-lint.yml @@ -33,8 +33,8 @@ jobs: brew install kube-linter FairwindsOps/tap/polaris # Install python deps - pip install --upgrade pip==24.1 - pip install tox + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 kube-linter version polaris version diff --git a/.github/workflows/pr-tests-helm-upgrade.yml b/.github/workflows/pr-tests-helm-upgrade.yml index 3013ba74de0..87e1580e67c 100644 --- a/.github/workflows/pr-tests-helm-upgrade.yml +++ b/.github/workflows/pr-tests-helm-upgrade.yml @@ -37,8 +37,8 @@ jobs: brew update # Install python deps - pip install --upgrade pip==24.1 - pip install tox + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 # Install kubernetes brew install helm k3d devspace kubectl diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml index 4f6dbfd9de1..56831f40e9e 100644 --- a/.github/workflows/pr-tests-linting.yml +++ b/.github/workflows/pr-tests-linting.yml @@ -29,10 +29,11 @@ jobs: - name: Install pip packages run: | - pip install --upgrade pip==24.1 uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 uv --version - - name: Get pip cache dir + - name: Get uv cache dir id: pip-cache shell: bash run: | @@ -47,10 +48,6 @@ jobs: restore-keys: | ${{ runner.os }}-uv-py${{ matrix.python-version }}- - - name: Install Tox - run: | - pip install --upgrade tox tox-uv==1.9.0 - - uses: pre-commit/action@v3.0.1 - name: Check Protocol Version diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index b87854cc86f..fa4a3903e1e 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -49,33 +49,13 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip packages if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.1 uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 uv --version - - name: Get pip cache dir - if: steps.changes.outputs.stack == 'true' - id: pip-cache - shell: bash - run: | - echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - - name: pip cache - uses: actions/cache@v4 - if: steps.changes.outputs.stack == 'true' - with: - path: ${{ steps.pip-cache.outputs.dir }} - key: ${{ runner.os }}-uv-py${{ matrix.python-version }} - restore-keys: | - ${{ runner.os }}-uv-py${{ matrix.python-version }} - - - name: Install tox - if: steps.changes.outputs.stack == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Run syft backend base image building test if: steps.changes.outputs.stack == 'true' timeout-minutes: 60 @@ -113,10 +93,11 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.1 uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.stack == 'true' id: pip-cache shell: bash @@ -200,10 +181,11 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.1 uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.stack == 'true' id: pip-cache shell: bash @@ -353,10 +335,11 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.1 uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.stack == 'true' id: pip-cache shell: bash diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 095946a5aed..ca9e5f37337 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -62,19 +62,14 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip packages if: steps.changes.outputs.syft == 'true' run: | python -m pip install --upgrade pip==24.1 + pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 + uv --version - - name: Install uv - if: steps.changes.outputs.syft == 'true' - run: | - python -m pip install uv==0.2.17 - python -m pip show uv - where uv || which uv - - - name: Get pip cache dir + - name: Get uv cache dir id: pip-cache if: steps.changes.outputs.syft == 'true' shell: bash @@ -96,11 +91,6 @@ jobs: # with: # set-host: true - - name: Install Dependencies - if: steps.changes.outputs.syft == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Run unit tests if: steps.changes.outputs.syft == 'true' run: | @@ -166,11 +156,10 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' run: | - pip install --upgrade pip==24.1 pip install uv==0.2.17 uv --version - - name: Get pip cache dir + - name: Get uv cache dir id: pip-cache if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' shell: bash @@ -249,10 +238,10 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' run: | - pip install --upgrade pip==24.1 uv==0.2.17 + pip install uv==0.2.17 uv --version - - name: Get pip cache dir + - name: Get uv cache dir id: pip-cache if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' shell: bash @@ -350,10 +339,10 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.syft == 'true' run: | - pip install --upgrade pip==24.1 uv==0.2.17 + pip install uv==0.2.17 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.syft == 'true' id: pip-cache shell: bash From 9ddac0e54c6588d0f1341d0af6a83ea65e8c5195 Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Sat, 29 Jun 2024 01:12:07 +0530 Subject: [PATCH 07/11] drop --upgrade from uv installs --- .github/workflows/cd-post-release-tests.yml | 2 +- .github/workflows/cd-syft.yml | 2 +- .github/workflows/cd-syftcli.yml | 4 +-- .github/workflows/pr-tests-frontend.yml | 2 +- .github/workflows/pr-tests-linting.yml | 2 +- .github/workflows/pr-tests-stack.yml | 23 +++------------ .github/workflows/pr-tests-syft.yml | 32 +++++++-------------- 7 files changed, 20 insertions(+), 47 deletions(-) diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index 7e1cf0caf76..d9bd2c52696 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -195,7 +195,7 @@ jobs: - name: Install tox and uv run: | - pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 tox-current-env + pip install uv==0.2.17 tox tox-uv==1.9.0 tox-current-env - name: Run unit tests run: | diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml index 32785bec9af..cc09881b8fd 100644 --- a/.github/workflows/cd-syft.yml +++ b/.github/workflows/cd-syft.yml @@ -135,7 +135,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip==24.1 - pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version + pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version==1.0.1 uv --version - name: Get Release tag diff --git a/.github/workflows/cd-syftcli.yml b/.github/workflows/cd-syftcli.yml index 60e3ac8c113..00b2c1ea5d3 100644 --- a/.github/workflows/cd-syftcli.yml +++ b/.github/workflows/cd-syftcli.yml @@ -66,7 +66,7 @@ jobs: if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }} run: | python -m pip install --upgrade pip==24.1 - pip install --upgrade tox setuptools wheel twine bump2version PyYAML + pip install --upgrade tox setuptools wheel twine bump2version==1.0.1 PyYAML==6.0.1 - name: Bump the Version if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }} @@ -122,7 +122,7 @@ jobs: - name: Install pip dependencies run: | python -m pip install --upgrade pip==24.1 - pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Build syftcli diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index 7e7cd279cce..0af0f403465 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -47,7 +47,7 @@ jobs: if: steps.changes.outputs.frontend == 'true' run: | python -m pip install --upgrade pip==24.1 - pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml index 56831f40e9e..f81e6d66d90 100644 --- a/.github/workflows/pr-tests-linting.yml +++ b/.github/workflows/pr-tests-linting.yml @@ -30,7 +30,7 @@ jobs: - name: Install pip packages run: | python -m pip install --upgrade pip==24.1 - pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index fa4a3903e1e..407068ef296 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -53,7 +53,7 @@ jobs: if: steps.changes.outputs.stack == 'true' run: | python -m pip install --upgrade pip==24.1 - pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Run syft backend base image building test @@ -94,7 +94,7 @@ jobs: if: steps.changes.outputs.stack == 'true' run: | python -m pip install --upgrade pip==24.1 - pip install uv==0.2.17 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir @@ -113,11 +113,6 @@ jobs: restore-keys: | ${{ runner.os }}-uv-py${{ matrix.python-version }} - - name: Install tox - if: steps.changes.outputs.stack == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Run Syft Integration Tests if: steps.changes.outputs.stack == 'true' timeout-minutes: 60 @@ -182,7 +177,7 @@ jobs: if: steps.changes.outputs.stack == 'true' run: | python -m pip install --upgrade pip==24.1 - pip install uv==0.2.17 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir @@ -201,11 +196,6 @@ jobs: restore-keys: | ${{ runner.os }}-uv-py${{ matrix.python-version }} - - name: Install tox - if: steps.changes.outputs.stack == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Install kubectl if: steps.changes.outputs.stack == 'true' run: | @@ -336,7 +326,7 @@ jobs: if: steps.changes.outputs.stack == 'true' run: | python -m pip install --upgrade pip==24.1 - pip install uv==0.2.17 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir @@ -355,11 +345,6 @@ jobs: restore-keys: | ${{ runner.os }}-uv-py${{ matrix.python-version }} - - name: Install tox - if: steps.changes.outputs.stack == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Install kubectl if: steps.changes.outputs.stack == 'true' run: | diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index ca9e5f37337..5bc0b2117b3 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -66,7 +66,7 @@ jobs: if: steps.changes.outputs.syft == 'true' run: | python -m pip install --upgrade pip==24.1 - pip install --upgrade uv==0.2.17 tox tox-uv==1.9.0 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir @@ -153,10 +153,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip packages if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' run: | - pip install uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir @@ -175,11 +176,6 @@ jobs: restore-keys: | ${{ runner.os }}-uv-py${{ matrix.python-version }}- - - name: Install Dependencies - if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Run notebook tests uses: nick-fields/retry@v3 if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' @@ -235,10 +231,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip packages if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' run: | - pip install uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir @@ -257,11 +254,6 @@ jobs: restore-keys: | ${{ runner.os }}-uv-py${{ matrix.python-version }}- - - name: Install Dependencies - if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Docker Compose on Linux if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'ubuntu-latest' shell: bash @@ -336,10 +328,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip packages if: steps.changes.outputs.syft == 'true' run: | - pip install uv==0.2.17 + python -m pip install --upgrade pip==24.1 + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - name: Get uv cache dir @@ -358,11 +351,6 @@ jobs: restore-keys: | ${{ runner.os }}-uv-py${{ matrix.python-version }}- - - name: Install Dependencies - if: steps.changes.outputs.syft == 'true' - run: | - pip install --upgrade tox tox-uv==1.9.0 - - name: Scan for security issues if: steps.changes.outputs.syft == 'true' run: | From d91639a6f4c3543ca8c7524b886cac4fc1deafd9 Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Sat, 29 Jun 2024 01:14:03 +0530 Subject: [PATCH 08/11] unpin pip version upgrades --- .github/workflows/cd-docs.yml | 2 +- .github/workflows/cd-post-release-tests.yml | 6 +++--- .github/workflows/cd-syft-dev.yml | 2 +- .github/workflows/cd-syft.yml | 4 ++-- .github/workflows/cd-syftcli.yml | 4 ++-- .github/workflows/e2e-tests-notebook.yml | 2 +- .github/workflows/post-merge-tasks.yml | 2 +- .github/workflows/pr-tests-frontend.yml | 2 +- .github/workflows/pr-tests-helm-lint.yml | 2 +- .github/workflows/pr-tests-helm-upgrade.yml | 2 +- .github/workflows/pr-tests-linting.yml | 2 +- .github/workflows/pr-tests-stack.yml | 8 ++++---- .github/workflows/pr-tests-syft.yml | 8 ++++---- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/cd-docs.yml b/.github/workflows/cd-docs.yml index bedbdc525f0..0a616b3820f 100644 --- a/.github/workflows/cd-docs.yml +++ b/.github/workflows/cd-docs.yml @@ -27,7 +27,7 @@ jobs: - name: Install pip dependencies run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index d9bd2c52696..f9c87f1a92d 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -53,7 +53,7 @@ jobs: - name: Upgrade pip run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip - name: Get pip cache dir id: pip-cache @@ -118,7 +118,7 @@ jobs: - name: Install pip dependencies run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version @@ -166,7 +166,7 @@ jobs: - name: Upgrade pip run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip - name: Get pip cache dir id: pip-cache diff --git a/.github/workflows/cd-syft-dev.yml b/.github/workflows/cd-syft-dev.yml index cc094a22001..b28510a2906 100644 --- a/.github/workflows/cd-syft-dev.yml +++ b/.github/workflows/cd-syft-dev.yml @@ -164,7 +164,7 @@ jobs: helm version # install tox - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install tox tox -e syft.build.helm diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml index cc09881b8fd..d0610ac7956 100644 --- a/.github/workflows/cd-syft.yml +++ b/.github/workflows/cd-syft.yml @@ -134,7 +134,7 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version==1.0.1 uv --version @@ -387,7 +387,7 @@ jobs: python-version: "3.12" - name: Install dependencies run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML uv --version diff --git a/.github/workflows/cd-syftcli.yml b/.github/workflows/cd-syftcli.yml index 00b2c1ea5d3..07f650cb2a6 100644 --- a/.github/workflows/cd-syftcli.yml +++ b/.github/workflows/cd-syftcli.yml @@ -65,7 +65,7 @@ jobs: - name: Install dependencies if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }} run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install --upgrade tox setuptools wheel twine bump2version==1.0.1 PyYAML==6.0.1 - name: Bump the Version @@ -121,7 +121,7 @@ jobs: - name: Install pip dependencies run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version diff --git a/.github/workflows/e2e-tests-notebook.yml b/.github/workflows/e2e-tests-notebook.yml index 0e45e3e5c4d..3c294c657e8 100644 --- a/.github/workflows/e2e-tests-notebook.yml +++ b/.github/workflows/e2e-tests-notebook.yml @@ -59,7 +59,7 @@ jobs: - name: Install pip dependencies run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version diff --git a/.github/workflows/post-merge-tasks.yml b/.github/workflows/post-merge-tasks.yml index 93f2320b238..be8e72591dd 100644 --- a/.github/workflows/post-merge-tasks.yml +++ b/.github/workflows/post-merge-tasks.yml @@ -26,7 +26,7 @@ jobs: - name: Install pip packages run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index 0af0f403465..b4af62d40ea 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -46,7 +46,7 @@ jobs: - name: Install pip dependencies if: steps.changes.outputs.frontend == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version diff --git a/.github/workflows/pr-tests-helm-lint.yml b/.github/workflows/pr-tests-helm-lint.yml index 3048fc702d7..99970aa6bc6 100644 --- a/.github/workflows/pr-tests-helm-lint.yml +++ b/.github/workflows/pr-tests-helm-lint.yml @@ -33,7 +33,7 @@ jobs: brew install kube-linter FairwindsOps/tap/polaris # Install python deps - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 kube-linter version diff --git a/.github/workflows/pr-tests-helm-upgrade.yml b/.github/workflows/pr-tests-helm-upgrade.yml index 87e1580e67c..84688130b29 100644 --- a/.github/workflows/pr-tests-helm-upgrade.yml +++ b/.github/workflows/pr-tests-helm-upgrade.yml @@ -37,7 +37,7 @@ jobs: brew update # Install python deps - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 # Install kubernetes diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml index f81e6d66d90..be4420cc0b7 100644 --- a/.github/workflows/pr-tests-linting.yml +++ b/.github/workflows/pr-tests-linting.yml @@ -29,7 +29,7 @@ jobs: - name: Install pip packages run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index 407068ef296..018956ab8df 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -52,7 +52,7 @@ jobs: - name: Install pip packages if: steps.changes.outputs.stack == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version @@ -93,7 +93,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version @@ -176,7 +176,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version @@ -325,7 +325,7 @@ jobs: - name: Upgrade pip if: steps.changes.outputs.stack == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 5bc0b2117b3..6102f41ad9a 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -65,7 +65,7 @@ jobs: - name: Install pip packages if: steps.changes.outputs.syft == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version @@ -156,7 +156,7 @@ jobs: - name: Install pip packages if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version @@ -234,7 +234,7 @@ jobs: - name: Install pip packages if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version @@ -331,7 +331,7 @@ jobs: - name: Install pip packages if: steps.changes.outputs.syft == 'true' run: | - python -m pip install --upgrade pip==24.1 + python -m pip install --upgrade pip pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version From df92e88807704355c56b64bc8169a5e324e67d55 Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Sat, 29 Jun 2024 01:15:17 +0530 Subject: [PATCH 09/11] rename step --- .github/workflows/cd-post-release-tests.yml | 6 +++--- .github/workflows/e2e-tests-notebook.yml | 2 +- .github/workflows/pr-tests-frontend.yml | 2 +- .github/workflows/pr-tests-linting.yml | 2 +- .github/workflows/pr-tests-stack.yml | 6 +++--- .github/workflows/pr-tests-syft.yml | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index f9c87f1a92d..a7ee5579647 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -61,7 +61,7 @@ jobs: run: | echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} @@ -128,7 +128,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} @@ -174,7 +174,7 @@ jobs: run: | echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} diff --git a/.github/workflows/e2e-tests-notebook.yml b/.github/workflows/e2e-tests-notebook.yml index 3c294c657e8..f45c54c125b 100644 --- a/.github/workflows/e2e-tests-notebook.yml +++ b/.github/workflows/e2e-tests-notebook.yml @@ -69,7 +69,7 @@ jobs: run: | echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index b4af62d40ea..fe45eee1904 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -57,7 +57,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.frontend == 'true' with: diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml index be4420cc0b7..6757fa15799 100644 --- a/.github/workflows/pr-tests-linting.yml +++ b/.github/workflows/pr-tests-linting.yml @@ -40,7 +40,7 @@ jobs: echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT # TODO: change cache key from setup.cfg to something more general - - name: pip cache + - name: load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index 018956ab8df..73f2e071b87 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -104,7 +104,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' with: @@ -187,7 +187,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' with: @@ -336,7 +336,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' with: diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 6102f41ad9a..35560005ba9 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -76,7 +76,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.syft == 'true' with: @@ -167,7 +167,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' with: @@ -245,7 +245,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' with: @@ -342,7 +342,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: pip cache + - name: load github cache uses: actions/cache@v4 if: steps.changes.outputs.syft == 'true' with: From 67041f4abfafd220bbf6eb05e947b9b502cb8e39 Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Sat, 29 Jun 2024 01:19:36 +0530 Subject: [PATCH 10/11] rename step --- .github/workflows/pr-tests-stack.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index 73f2e071b87..fd478a4ead0 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -90,7 +90,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip dependencies if: steps.changes.outputs.stack == 'true' run: | python -m pip install --upgrade pip @@ -173,7 +173,7 @@ jobs: docker builder prune --all --force docker system prune --all --force - - name: Upgrade pip + - name: Install pip dependencies if: steps.changes.outputs.stack == 'true' run: | python -m pip install --upgrade pip @@ -322,7 +322,7 @@ jobs: docker builder prune --all --force docker system prune --all --force - - name: Upgrade pip + - name: Install pip dependencies if: steps.changes.outputs.stack == 'true' run: | python -m pip install --upgrade pip From d76865e989ef6aec24edbc1a62e4bb13b77f3ddf Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Sat, 29 Jun 2024 01:28:35 +0530 Subject: [PATCH 11/11] title case step name --- .github/workflows/cd-post-release-tests.yml | 6 +++--- .github/workflows/e2e-tests-notebook.yml | 2 +- .github/workflows/pr-tests-frontend.yml | 2 +- .github/workflows/pr-tests-linting.yml | 2 +- .github/workflows/pr-tests-stack.yml | 6 +++--- .github/workflows/pr-tests-syft.yml | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index a7ee5579647..c5910195bfc 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -61,7 +61,7 @@ jobs: run: | echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} @@ -128,7 +128,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} @@ -174,7 +174,7 @@ jobs: run: | echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} diff --git a/.github/workflows/e2e-tests-notebook.yml b/.github/workflows/e2e-tests-notebook.yml index f45c54c125b..deef4da0680 100644 --- a/.github/workflows/e2e-tests-notebook.yml +++ b/.github/workflows/e2e-tests-notebook.yml @@ -69,7 +69,7 @@ jobs: run: | echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index fe45eee1904..7d1edb6ed35 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -57,7 +57,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.frontend == 'true' with: diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml index 6757fa15799..339c9a231a4 100644 --- a/.github/workflows/pr-tests-linting.yml +++ b/.github/workflows/pr-tests-linting.yml @@ -40,7 +40,7 @@ jobs: echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT # TODO: change cache key from setup.cfg to something more general - - name: load github cache + - name: Load github cache uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index fd478a4ead0..eae0b555c3e 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -104,7 +104,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' with: @@ -187,7 +187,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' with: @@ -336,7 +336,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' with: diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 35560005ba9..7dd976e12a4 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -76,7 +76,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.syft == 'true' with: @@ -167,7 +167,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.syft == 'true' || steps.changes.outputs.notebooks == 'true' with: @@ -245,7 +245,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true' with: @@ -342,7 +342,7 @@ jobs: run: | echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT - - name: load github cache + - name: Load github cache uses: actions/cache@v4 if: steps.changes.outputs.syft == 'true' with: