Skip to content

Commit c80d3c2

Browse files
yashgoranayashgorana
authored
Merge pull request #8991 from khoaguin/fix-uv-windows-issue
Fix uv issue on windows
2 parents 249735c + d76865e commit c80d3c2

13 files changed

+88
-140
lines changed

‎.github/workflows/cd-docs.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ jobs:
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727

28-
- name: Install tox
28+
- name: Install pip dependencies
2929
run: |
30-
pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0
30+
python -m pip install --upgrade pip
31+
pip install uv==0.2.17 tox tox-uv==1.9.0
3132
uv --version
3233
3334
- name: Build the docs

‎.github/workflows/cd-post-release-tests.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ jobs:
5353

5454
- name: Upgrade pip
5555
run: |
56-
python -m pip install --upgrade --user pip
56+
python -m pip install --upgrade pip
5757
5858
- name: Get pip cache dir
5959
id: pip-cache
6060
shell: bash
6161
run: |
6262
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
6363
64-
- name: pip cache
64+
- name: Load github cache
6565
uses: actions/cache@v4
6666
with:
6767
path: ${{ steps.pip-cache.outputs.dir }}
@@ -116,23 +116,25 @@ jobs:
116116
K3D_VERSION=v5.6.3
117117
wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=$K3D_VERSION bash
118118
119-
- name: Get pip cache dir
119+
- name: Install pip dependencies
120+
run: |
121+
python -m pip install --upgrade pip
122+
pip install uv==0.2.17 tox tox-uv==1.9.0
123+
uv --version
124+
125+
- name: Get uv cache dir
120126
id: pip-cache
121127
shell: bash
122128
run: |
123-
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
129+
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT
124130
125-
- name: pip cache
131+
- name: Load github cache
126132
uses: actions/cache@v4
127133
with:
128134
path: ${{ steps.pip-cache.outputs.dir }}
129135
key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
130136
restore-keys: |
131-
${{ runner.os }}-pip-py${{ matrix.python-version }}-
132-
133-
- name: Install tox
134-
run: |
135-
pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0
137+
${{ runner.os }}-uv-py${{ matrix.python-version }}-
136138
137139
- name: Run K8s tests
138140
env:
@@ -164,15 +166,15 @@ jobs:
164166

165167
- name: Upgrade pip
166168
run: |
167-
python -m pip install --upgrade --user pip
169+
python -m pip install --upgrade pip
168170
169171
- name: Get pip cache dir
170172
id: pip-cache
171173
shell: bash
172174
run: |
173175
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
174176
175-
- name: pip cache
177+
- name: Load github cache
176178
uses: actions/cache@v4
177179
with:
178180
path: ${{ steps.pip-cache.outputs.dir }}
@@ -193,7 +195,7 @@ jobs:
193195
194196
- name: Install tox and uv
195197
run: |
196-
pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 tox-current-env
198+
pip install uv==0.2.17 tox tox-uv==1.9.0 tox-current-env
197199
198200
- name: Run unit tests
199201
run: |

‎.github/workflows/cd-syft-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
helm version
165165
166166
# install tox
167-
python -m pip install --upgrade pip==24.0
167+
python -m pip install --upgrade pip
168168
pip install tox
169169
170170
tox -e syft.build.helm

‎.github/workflows/cd-syft.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ jobs:
134134
135135
- name: Install dependencies
136136
run: |
137-
pip install --upgrade pip==24.0 uv==0.2.13 bump2version tox tox-uv==1.9.0
137+
python -m pip install --upgrade pip
138+
pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version==1.0.1
138139
uv --version
139140
140141
- name: Get Release tag
@@ -386,7 +387,8 @@ jobs:
386387
python-version: "3.12"
387388
- name: Install dependencies
388389
run: |
389-
pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
390+
python -m pip install --upgrade pip
391+
pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
390392
uv --version
391393
392394
- name: Bump the Version

‎.github/workflows/cd-syftcli.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
- name: Install dependencies
6666
if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }}
6767
run: |
68-
python -m pip install --upgrade pip==24.0
69-
pip install --upgrade tox setuptools wheel twine bump2version PyYAML
68+
python -m pip install --upgrade pip
69+
pip install --upgrade tox setuptools wheel twine bump2version==1.0.1 PyYAML==6.0.1
7070
7171
- name: Bump the Version
7272
if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }}
@@ -119,13 +119,11 @@ jobs:
119119
with:
120120
python-version: "3.12"
121121

122-
- name: Install build dependencies for syftcli
122+
- name: Install pip dependencies
123123
run: |
124-
pip install --upgrade pip==24.0
125-
126-
- name: Install Tox
127-
run: |
128-
pip install -U tox
124+
python -m pip install --upgrade pip
125+
pip install uv==0.2.17 tox tox-uv==1.9.0
126+
uv --version
129127
130128
- name: Build syftcli
131129
env:

‎.github/workflows/e2e-tests-notebook.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,19 @@ jobs:
5757
with:
5858
python-version: ${{ matrix.python-version }}
5959

60-
- name: Upgrade pip
60+
- name: Install pip dependencies
6161
run: |
62-
python -m pip install --upgrade --user pip
63-
64-
- name: Install Deps
65-
run: |
66-
pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0
62+
python -m pip install --upgrade pip
63+
pip install uv==0.2.17 tox tox-uv==1.9.0
64+
uv --version
6765
6866
- name: Get pip cache dir
6967
id: pip-cache
7068
shell: bash
7169
run: |
7270
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
7371
74-
- name: pip cache
72+
- name: Load github cache
7573
uses: actions/cache@v4
7674
with:
7775
path: ${{ steps.pip-cache.outputs.dir }}

‎.github/workflows/post-merge-tasks.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ jobs:
2626

2727
- name: Install pip packages
2828
run: |
29-
python -m pip install --upgrade --user pip tox
29+
python -m pip install --upgrade pip
30+
pip install uv==0.2.17 tox tox-uv==1.9.0
31+
uv --version
3032
3133
- name: Check and Bump Protocol Version
3234
run: |

‎.github/workflows/pr-tests-frontend.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,21 @@ jobs:
4343
with:
4444
python-version: ${{ matrix.python-version }}
4545

46-
- name: Upgrade pip
46+
- name: Install pip dependencies
4747
if: steps.changes.outputs.frontend == 'true'
4848
run: |
49-
pip install --upgrade pip==24.0 uv==0.2.13
49+
python -m pip install --upgrade pip
50+
pip install uv==0.2.17 tox tox-uv==1.9.0
5051
uv --version
5152
52-
- name: Get pip cache dir
53+
- name: Get uv cache dir
5354
id: pip-cache
5455
if: steps.changes.outputs.frontend == 'true'
5556
shell: bash
5657
run: |
5758
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT
5859
59-
- name: pip cache
60+
- name: Load github cache
6061
uses: actions/cache@v4
6162
if: steps.changes.outputs.frontend == 'true'
6263
with:
@@ -69,11 +70,6 @@ jobs:
6970
if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest'
7071
uses: crazy-max/[email protected]
7172

72-
- name: Install Tox
73-
if: steps.changes.outputs.frontend == 'true'
74-
run: |
75-
pip install --upgrade tox tox-uv==1.9.0
76-
7773
- name: Remove existing containers
7874
if: steps.changes.outputs.frontend == 'true'
7975
continue-on-error: true

‎.github/workflows/pr-tests-helm-lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
brew install kube-linter FairwindsOps/tap/polaris
3434
3535
# Install python deps
36-
pip install --upgrade pip==24.0
37-
pip install tox
36+
python -m pip install --upgrade pip
37+
pip install uv==0.2.17 tox tox-uv==1.9.0
3838
3939
kube-linter version
4040
polaris version

‎.github/workflows/pr-tests-helm-upgrade.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
brew update
3838
3939
# Install python deps
40-
pip install --upgrade pip==24.0
41-
pip install tox
40+
python -m pip install --upgrade pip
41+
pip install uv==0.2.17 tox tox-uv==1.9.0
4242
4343
# Install kubernetes
4444
brew install helm k3d devspace kubectl

‎.github/workflows/pr-tests-linting.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,25 @@ jobs:
2929

3030
- name: Install pip packages
3131
run: |
32-
pip install --upgrade pip==24.0 uv==0.2.13
32+
python -m pip install --upgrade pip
33+
pip install uv==0.2.17 tox tox-uv==1.9.0
3334
uv --version
3435
35-
- name: Get pip cache dir
36+
- name: Get uv cache dir
3637
id: pip-cache
3738
shell: bash
3839
run: |
3940
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT
4041
4142
# TODO: change cache key from setup.cfg to something more general
42-
- name: pip cache
43+
- name: Load github cache
4344
uses: actions/cache@v4
4445
with:
4546
path: ${{ steps.pip-cache.outputs.dir }}
4647
key: ${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
4748
restore-keys: |
4849
${{ runner.os }}-uv-py${{ matrix.python-version }}-
4950
50-
- name: Install Tox
51-
run: |
52-
pip install --upgrade tox tox-uv==1.9.0
53-
5451
- uses: pre-commit/[email protected]
5552

5653
- name: Check Protocol Version

0 commit comments

Comments
 (0)