Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ env:
# - rustpython-compiler-source: deprecated
# - rustpython-venvlauncher: Windows-only
WORKSPACE_EXCLUDES: --exclude rustpython_wasm --exclude rustpython-compiler-source --exclude rustpython-venvlauncher
# Python version targeted by the CI.
PYTHON_VERSION: "3.14.3"
X86_64_PC_WINDOWS_MSVC_OPENSSL_LIB_DIR: C:\Program Files\OpenSSL\lib\VC\x64\MD
X86_64_PC_WINDOWS_MSVC_OPENSSL_INCLUDE_DIR: C:\Program Files\OpenSSL\include
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -259,8 +257,6 @@ jobs:
save-if: ${{ github.ref == 'refs/heads/main' }}

- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}

- name: Install macOS dependencies
uses: ./.github/actions/install-macos-deps
Expand Down Expand Up @@ -362,8 +358,6 @@ jobs:
persist-credentials: false

- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}

- uses: dtolnay/rust-toolchain@stable
with:
Expand Down Expand Up @@ -469,8 +463,6 @@ jobs:
tar -xzf geckodriver-v0.36.0-linux64.tar.gz -C geckodriver

- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}

- run: python -m pip install -r requirements.txt
working-directory: ./wasm/tests
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/cron-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ name: Periodic checks/tasks

env:
CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,ssl-rustls,jit,host_env
PYTHON_VERSION: "3.14.3"

jobs:
# codecov collects code coverage data from the rust tests, python snippets and python test suite.
Expand All @@ -30,9 +29,9 @@ jobs:

- uses: dtolnay/rust-toolchain@stable
- uses: taiki-e/install-action@cargo-llvm-cov
- uses: actions/setup-python@v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}

- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0

- run: sudo apt-get update && sudo apt-get -y install lcov
- name: Run cargo-llvm-cov with Rust tests.
run: cargo llvm-cov --no-report --workspace --exclude rustpython_wasm --exclude rustpython-compiler-source --exclude rustpython-venvlauncher --verbose --no-default-features --features stdlib,importlib,stdio,encodings,ssl-rustls,jit,host_env
Expand Down Expand Up @@ -96,9 +95,9 @@ jobs:
persist-credentials: true

- uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}

- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0

- name: build rustpython
run: cargo build --release --verbose
- name: Collect what is left data
Expand Down Expand Up @@ -157,9 +156,9 @@ jobs:
persist-credentials: true

- uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}

- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0

- run: cargo install cargo-criterion
- name: build benchmarks
run: cargo build --release --benches
Expand Down
20 changes: 13 additions & 7 deletions .github/workflows/lib-deps-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number }}
cancel-in-progress: true

env:
PYTHON_VERSION: "3.14.3"

jobs:
check_deps:
permissions:
Expand All @@ -37,13 +34,24 @@
# Checkout only Lib/ directory from PR head for accurate comparison
git checkout ${{ github.event.pull_request.head.sha }} -- Lib/

- name: Checkout CPython
- name: Get target CPython version
id: cpython-version
run: |
git clone --depth 1 --branch "v${{ env.PYTHON_VERSION }}" https://github.com/python/cpython.git cpython
version=$(cat .python-version)
echo "version=${version}" >> "$GITHUB_OUTPUT"

- name: Checkout CPython
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
repository: python/cpython
path: cpython
ref: "v${{ steps.cpython-version.outputs.version }}"
fetch-depth: 1
persist-credentials: false

- name: Get changed Lib files
id: changed-files
run: |

Check warning on line 54 in .github/workflows/lib-deps-check.yaml

View workflow job for this annotation

GitHub Actions / Lint

[actionlint] reported by reviewdog 🐶 shellcheck reported issue in this script: SC2086:info:27:28: Double quote to prevent globbing and word splitting [shellcheck] Raw Output: i:.github/workflows/lib-deps-check.yaml:54:9: shellcheck reported issue in this script: SC2086:info:27:28: Double quote to prevent globbing and word splitting [shellcheck]

Check warning on line 54 in .github/workflows/lib-deps-check.yaml

View workflow job for this annotation

GitHub Actions / Lint

[actionlint] reported by reviewdog 🐶 shellcheck reported issue in this script: SC2076:warning:20:43: Remove quotes from right-hand side of =~ to match as a regex rather than literally [shellcheck] Raw Output: w:.github/workflows/lib-deps-check.yaml:54:9: shellcheck reported issue in this script: SC2076:warning:20:43: Remove quotes from right-hand side of =~ to match as a regex rather than literally [shellcheck]
# Get the list of changed files under Lib/
changed=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} -- 'Lib/*.py' 'Lib/**/*.py' | head -50)
echo "Changed files:"
Expand Down Expand Up @@ -75,8 +83,6 @@
- name: Setup Python
if: steps.changed-files.outputs.modules != ''
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: "${{ env.PYTHON_VERSION }}"

- name: Run deps check
if: steps.changed-files.outputs.modules != ''
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/update-libs-status.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
issues: write

env:
PYTHON_VERSION: "v3.14.3"
ISSUE_ID: "6839"

jobs:
Expand All @@ -29,13 +28,20 @@
sparse-checkout: |-
Lib
scripts/update_lib
.python-version

- name: Clone CPython ${{ env.PYTHON_VERSION }}
- name: Get target CPython version
id: cpython-version
run: |
version=$(cat rustpython/.python-version)
echo "version=${version}" >> "$GITHUB_OUTPUT"

- name: Clone CPython
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
repository: python/cpython
path: cpython
ref: ${{ env.PYTHON_VERSION }}
ref: "v${{ steps.cpython-version.outputs.version }}"
persist-credentials: false
sparse-checkout: |
Lib
Expand All @@ -56,14 +62,14 @@

## Summary

Check \`scripts/update_lib\` for tools. As a note, the current latest Python version is \`${{ env.PYTHON_VERSION }}\`.
Check \`scripts/update_lib\` for tools. As a note, the current latest Python version is \`${{ steps.cpython-version.outputs.version }}\`.

Check notice

Code scanning / zizmor

code injection via template expansion Note

code injection via template expansion

Previous versions' issues as reference
- 3.13: #5529

<!--
Quick guideline for Copilot:
# Clone \`github.com/python/cpython\` \`${{ env.PYTHON_VERSION }}\` tag under RustPython working dir with depth 1 option; never 3.14.0 or 3.14.1 or 3.14.2
# Clone \`github.com/python/cpython\` \`${{ steps.cpython-version.outputs.version }}\` tag under RustPython working dir with depth 1 option; never 3.14.0 or 3.14.1 or 3.14.2

Check notice

Code scanning / zizmor

code injection via template expansion Note

code injection via template expansion
# Pick a library or test to update. Probably user give one.
# Run \`python3 scripts/update_lib quick <name>\`
# A commit is automatically created. push the commit.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-pylib.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cache:
- cpython-lib-

env:
PYTHON_VERSION: "v3.14.3"
PYTHON_VERSION: "v3.14.4"
ISSUE_ID: "6839"
---

Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ __pycache__/
wasm-pack.log
.idea/
.envrc
.python-version

flame-graph.html
flame.txt
Expand Down
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.14.4
Loading