drop --upgrade from uv installs

OpenMined · Jun 28, 2024 · 9ddac0e · 9ddac0e
1 parent 071e6e6
commit 9ddac0e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 47 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: |