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.

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

Fix uv issue on windows #8991

Merged
merged 11 commits into from
Jun 28, 2024
5 changes: 3 additions & 2 deletions .github/workflows/cd-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 15 additions & 13 deletions .github/workflows/cd-post-release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ 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
shell: bash
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 }}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -164,15 +166,15 @@ 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
shell: bash
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 }}
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-syft-dev.yml
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
pip install tox

tox -e syft.build.helm
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/cd-syftcli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/e2e-tests-notebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,19 @@ 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
shell: bash
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 }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/post-merge-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/pr-tests-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -69,11 +70,6 @@ jobs:
if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest'
uses: crazy-max/[email protected]

- 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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-tests-helm-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-tests-helm-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/pr-tests-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,25 @@ 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 }}
key: ${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
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/[email protected]

- name: Check Protocol Version
Expand Down
Loading
Loading