diff --git a/.github/workflows/cd-docs.yml b/.github/workflows/cd-docs.yml index 0e741baacc6..0a616b3820f 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.0 uv==0.2.13 tox tox-uv==1.9.0 + python -m pip install --upgrade pip + 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 adaafb47f9a..c5910195bfc 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 - name: Get pip cache dir id: pip-cache @@ -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 }} @@ -116,23 +116,25 @@ 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 + 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 + - name: Load github cache uses: actions/cache@v4 with: 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.0 uv==0.2.13 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 - name: Get pip cache dir id: pip-cache @@ -172,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 }} @@ -193,7 +195,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 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..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.0 + 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 fc0818a0814..d0610ac7956 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.0 uv==0.2.13 bump2version tox tox-uv==1.9.0 + python -m pip install --upgrade pip + pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version==1.0.1 uv --version - name: Get Release tag @@ -386,7 +387,8 @@ 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 + 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 - name: Bump the Version diff --git a/.github/workflows/cd-syftcli.yml b/.github/workflows/cd-syftcli.yml index 7b29caea012..07f650cb2a6 100644 --- a/.github/workflows/cd-syftcli.yml +++ b/.github/workflows/cd-syftcli.yml @@ -65,8 +65,8 @@ 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 - pip install --upgrade tox setuptools wheel twine bump2version PyYAML + 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 if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }} @@ -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.0 - - - name: Install Tox - run: | - pip install -U tox + python -m pip install --upgrade pip + pip install 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 ebf843f10a6..deef4da0680 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.0 uv==0.2.13 tox tox-uv==1.9.0 + python -m pip install --upgrade pip + pip install uv==0.2.17 tox tox-uv==1.9.0 + uv --version - name: Get pip cache dir id: pip-cache @@ -71,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/post-merge-tasks.yml b/.github/workflows/post-merge-tasks.yml index eefed62f8a3..be8e72591dd 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 + 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 99b6aa79f3c..7d1edb6ed35 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -43,20 +43,21 @@ 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.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install 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 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: @@ -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 c55479f9f7f..99970aa6bc6 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.0 - pip install tox + python -m pip install --upgrade pip + 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 0419a125369..84688130b29 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.0 - pip install tox + python -m pip install --upgrade pip + 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 c2b71998087..339c9a231a4 100644 --- a/.github/workflows/pr-tests-linting.yml +++ b/.github/workflows/pr-tests-linting.yml @@ -29,17 +29,18 @@ jobs: - name: Install pip packages run: | - pip install --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install 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: | 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 }} @@ -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 b0aefd3f23c..eae0b555c3e 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.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install 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 @@ -110,20 +90,21 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip dependencies if: steps.changes.outputs.stack == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.stack == 'true' id: pip-cache shell: bash 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: @@ -132,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 @@ -197,20 +173,21 @@ 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: | - pip install --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.stack == 'true' id: pip-cache shell: bash 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: @@ -219,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: | @@ -350,20 +322,21 @@ 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: | - pip install --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.stack == 'true' id: pip-cache shell: bash 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: @@ -372,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 e416700f149..7dd976e12a4 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -62,20 +62,21 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip packages if: steps.changes.outputs.syft == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install 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.syft == 'true' shell: bash 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: @@ -90,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: | @@ -157,20 +153,21 @@ 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 --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install 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.syft == 'true' || steps.changes.outputs.notebooks == 'true' shell: bash 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: @@ -179,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' @@ -239,20 +231,21 @@ 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 --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install 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.stack == 'true' || steps.changes.outputs.notebooks == 'true' shell: bash 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: @@ -261,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 @@ -340,20 +328,21 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip + - name: Install pip packages if: steps.changes.outputs.syft == 'true' run: | - pip install --upgrade pip==24.0 uv==0.2.13 + python -m pip install --upgrade pip + pip install uv==0.2.17 tox tox-uv==1.9.0 uv --version - - name: Get pip cache dir + - name: Get uv cache dir if: steps.changes.outputs.syft == 'true' id: pip-cache shell: bash 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: @@ -362,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: |