From 7c77f5e6451751f6dbcb1cd9f592bbe37095184f Mon Sep 17 00:00:00 2001 From: youknowdot Date: Sun, 11 Oct 2026 04:33:36 +0900 Subject: [PATCH] Restore official Python setup for 3.15 final Use the existing pinned setup-python action now that its official catalog supplies CPython 3.15.0. Remove the temporary standalone provisioning action and its sparse-checkout entry while retaining interpreter outputs and requested versions. Assisted-by: OpenAI Codex:model identifier unavailable --- .github/actions/setup-python/action.yml | 57 ------------------------- .github/workflows/ci.yaml | 6 +-- .github/workflows/codspeed.yaml | 2 +- .github/workflows/cron-ci.yaml | 6 +-- .github/workflows/lib-deps-check.yaml | 2 +- .github/workflows/pyperformance.yaml | 2 +- .github/workflows/update-doc-db.yml | 3 +- 7 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 .github/actions/setup-python/action.yml diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml deleted file mode 100644 index 6a7019514..000000000 --- a/.github/actions/setup-python/action.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Set up reference Python -description: Install CPython from python-build-standalone with pip available. -inputs: - python-version: - description: CPython version to install - default: "3.15.0" -outputs: - python-path: - description: Path to the installed interpreter - value: ${{ steps.python.outputs.python-path }} - python-version: - description: Installed CPython version - value: ${{ steps.python.outputs.python-version }} -runs: - using: composite - steps: - # uv 0.13.0 includes the final 3.15.0 builds, before setup-python's catalog. - - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0 - with: - version: "0.13.0" - python-version: ${{ inputs.python-version }} - activate-environment: true - no-project: true - venv-path: ${{ runner.temp }}/reference-python - enable-cache: false - env: - UV_VENV_SEED: "true" - UV_MANAGED_PYTHON: "true" - - id: python - shell: bash - env: - REQUESTED_PYTHON: ${{ inputs.python-version }} - run: | - python - <<'PY' - import os - import platform - import sys - - if os.environ["REQUESTED_PYTHON"] == "3.15.0": - assert sys.version_info[:3] == (3, 15, 0), sys.version - assert sys.version_info.releaselevel == "final", sys.version - with open(os.environ["GITHUB_OUTPUT"], "a") as output: - print(f"python-path={sys.executable}", file=output) - print(f"python-version={platform.python_version()}", file=output) - with open(os.environ["GITHUB_ENV"], "a") as env: - print(f"pythonLocation={sys.base_prefix}", file=env) - if sys.platform == "linux": - lib = os.path.join(sys.base_prefix, "lib") - previous = os.environ.get("LD_LIBRARY_PATH") - lib_path = os.pathsep.join([lib, previous] if previous else [lib]) - print(f"LD_LIBRARY_PATH={lib_path}", file=env) - if sys.platform == "win32": - with open(os.environ["GITHUB_PATH"], "a") as path: - print(sys.base_prefix, file=path) - print(os.path.dirname(sys.executable), file=path) - print(sys.version) - PY diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ba1475b02..7797a7dc3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -539,7 +539,7 @@ jobs: # Windows runners randomly crashes, https://github.com/actions/cache/issues/1754 continue-on-error: true - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - name: Install macOS dependencies uses: ./.github/actions/install-macos-deps @@ -752,7 +752,7 @@ jobs: with: persist-credentials: false - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - uses: dtolnay/rust-toolchain@stable with: @@ -914,7 +914,7 @@ jobs: mkdir geckodriver tar -xzf geckodriver-v0.36.0-linux64.tar.gz -C geckodriver - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - run: python -m pip install -r requirements.txt working-directory: ./wasm/tests diff --git a/.github/workflows/codspeed.yaml b/.github/workflows/codspeed.yaml index 04129d5c2..c7fc88352 100644 --- a/.github/workflows/codspeed.yaml +++ b/.github/workflows/codspeed.yaml @@ -49,7 +49,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable # The benchmarks are linked against libpython through the pyo3 dev-dependency. - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - name: Restore the machine main last measured on # A recording that cannot be fetched is read as "none yet", which the step diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index f0d1d1499..f5e7bddc2 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -37,7 +37,7 @@ jobs: with: tool: cargo-llvm-cov - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - run: sudo apt-get update && sudo apt-get -y install lcov @@ -110,7 +110,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - name: build rustpython run: cargo build --release --verbose --features sqlite @@ -170,7 +170,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - run: cargo install cargo-criterion diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index 922eac928..6f147542e 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -107,7 +107,7 @@ jobs: - name: Setup Python if: steps.changed-files.outputs.modules != '' - uses: ./.github/actions/setup-python + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - name: Run deps check if: steps.changed-files.outputs.modules != '' diff --git a/.github/workflows/pyperformance.yaml b/.github/workflows/pyperformance.yaml index 03604b31e..05f76266e 100644 --- a/.github/workflows/pyperformance.yaml +++ b/.github/workflows/pyperformance.yaml @@ -60,7 +60,7 @@ jobs: # Both the third interpreter under test and the host pyperformance # itself runs on (it only runs under a real CPython; RustPython is just # the `--python` target it drives). - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 id: cpython with: python-version: "3.15.0" diff --git a/.github/workflows/update-doc-db.yml b/.github/workflows/update-doc-db.yml index 5b0dba415..3abdf27de 100644 --- a/.github/workflows/update-doc-db.yml +++ b/.github/workflows/update-doc-db.yml @@ -35,9 +35,8 @@ jobs: persist-credentials: false sparse-checkout: | crates/doc - .github/actions/setup-python - - uses: ./.github/actions/setup-python + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: ${{ inputs.python-version }}