Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix uv issue on windows #8991

Merged
merged 11 commits into from
Jun 28, 2024
Merged

Fix uv issue on windows #8991

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3944332
[CD] debugging installing uv on windows
khoaguin Jun 28, 2024
38d5cac
[CD/unit-tests] separate pip and uv installation commands
khoaguin Jun 28, 2024
a3498b5
[CD/unit-tests] using `python -m pip` for upgrading `pip`
khoaguin Jun 28, 2024
5f7598a
[CD/units-tests] removing debugging step using `tunshell` in workflow…
khoaguin Jun 28, 2024
39e4cda
[syft/dependencies] update pip to 24.1 and uv to 0.2.17
khoaguin Jun 28, 2024
071e6e6
make pip upgrade + deps install consistent across actions
yashgorana Jun 28, 2024
9ddac0e
drop --upgrade from uv installs
yashgorana Jun 28, 2024
d91639a
unpin pip version upgrades
yashgorana Jun 28, 2024
df92e88
rename step
yashgorana Jun 28, 2024
67041f4
rename step
yashgorana Jun 28, 2024
d76865e
title case step name
yashgorana Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
khoaguin marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Build the docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-post-release-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved

- name: Run K8s tests
env:
Expand Down Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved

- name: Run unit tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-syft-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
pip install tox

tox -e syft.build.helm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-syft.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get Release tag
Expand Down Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Bump the Version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-syftcli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
pip install --upgrade tox setuptools wheel twine bump2version PyYAML

- name: Bump the Version
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:

- name: Install build dependencies for syftcli
run: |
pip install --upgrade pip==24.0
pip install --upgrade pip==24.1
yashgorana marked this conversation as resolved.
Show resolved Hide resolved

- name: Install Tox
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests-notebook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved

- name: Get pip cache dir
id: pip-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-helm-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
pip install tox

kube-linter version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-helm-upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
brew update

# Install python deps
pip install --upgrade pip==24.0
pip install --upgrade pip==24.1
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
pip install tox

# Install kubernetes
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-linting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-tests-stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down Expand Up @@ -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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/pr-tests-syft.yml
View file
Open in desktop
khoaguin marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,14 @@ jobs:
- name: Upgrade pip
if: steps.changes.outputs.syft == 'true'
run: |
pip install --upgrade pip==24.0 uv==0.2.13
uv --version
python -m pip install --upgrade pip==24.1
yashgorana marked this conversation as resolved.
Show resolved Hide resolved

- name: Install uv
if: steps.changes.outputs.syft == 'true'
run: |
python -m pip install uv==0.2.17
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
python -m pip show uv
where uv || which uv

- name: Get pip cache dir
id: pip-cache
Expand Down Expand Up @@ -160,7 +166,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.1
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
pip install uv==0.2.17
uv --version

- name: Get pip cache dir
Expand Down Expand Up @@ -242,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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down Expand Up @@ -343,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
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
yashgorana marked this conversation as resolved.
Show resolved Hide resolved
uv --version

- name: Get pip cache dir
Expand Down
Loading