From 740da889c720ea4e06656e529b7dbfc00034a695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Sat, 1 Feb 2025 23:41:16 +0100 Subject: [PATCH] ci: install Python the same way everywhere For wheel builds, we shouldn't create a virtualenv, as it conflicts with the check phase --- .github/actions/setup-dependencies/action.yml | 4 ++++ .github/workflows/CI.yml | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-dependencies/action.yml b/.github/actions/setup-dependencies/action.yml index 588a4b7dc3..0f2e15b90a 100644 --- a/.github/actions/setup-dependencies/action.yml +++ b/.github/actions/setup-dependencies/action.yml @@ -39,3 +39,7 @@ runs: - name: Install the project run: uv sync shell: bash + + - name: Setup pip # some tools need it, and uv virtualenvs doesn't contain it + run: uv pip install pip + shell: bash diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bf9f679877..722f9160ac 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -34,9 +34,6 @@ jobs: - name: Checkout source code uses: actions/checkout@v4 - - name: Setup Python - uses: actions/setup-python@v5 - - name: Setup 3rd party dependencies uses: ./.github/actions/setup-dependencies with: @@ -129,9 +126,10 @@ jobs: - name: Checkout source code uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - name: Setup 3rd party dependencies + uses: ./.github/actions/setup-dependencies with: - python-version: 3.x + install-test-deps: "false" - name: Build wheels uses: PyO3/maturin-action@v1 @@ -221,9 +219,10 @@ jobs: - name: Checkout source code uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - name: Setup 3rd party dependencies + uses: ./.github/actions/setup-dependencies with: - python-version: 3.x + install-test-deps: "false" - name: Build wheels uses: PyO3/maturin-action@v1