Skip to content

Align compiler and AST behavior with CPython #8138

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.

Sign up for GitHub

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

Draft
youknowone wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Align compiler and AST behavior with CPython #8138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af789fa
Align compiler and AST behavior with CPython
youknowone Jun 22, 2026
308df73
fix
youknowone Jun 23, 2026
4abf27b
Fix PR 8138 CI failures
youknowone Jun 23, 2026
3dc1a60
Fix match mapping wildcard scan complexity
youknowone Jun 23, 2026
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
3 changes: 3 additions & 0 deletions .cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,11 @@
"deoptimize",
"emscripten",
"excs",
"flufl",
"fnfe",
"fsdefault",
"ifexp",
"implicits",
"interps",
"jitted",
"jitting",
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repos:
priority: 0

- id: ruff-check
args: [--select, I, --fix, --exit-non-zero-on-fix]
args: [--select, I, --fix, --exit-non-zero-on-fix, --config, "lint.isort.known-first-party = ['cpython', 'opcodes', 'utils']"]
types_or: [python]
require_serial: true
priority: 1
Expand Down
194 changes: 100 additions & 94 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 11 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
flamescope = { version = "0.1.2", optional = true }

rustls = { workspace = true, optional = true }
rustls-graviola = { workspace = true, optional = true }

Check warning on line 52 in Cargo.toml

View workflow job for this annotation

GitHub Actions / cargo shear

shear/misplaced_optional_dependency 

misplaced optional dependency `rustls-graviola` (remove the `optional` flag and move to `[dev-dependencies]`)

[target.'cfg(windows)'.dependencies]
libc = { workspace = true }
Expand Down Expand Up @@ -183,19 +183,16 @@
rustpython-wtf8 = { path = "crates/wtf8", version = "0.5.0" }
rustpython-doc = { path = "crates/doc", version = "0.5.0" }

# Use RustPython-packaged Ruff crates from the published fork while keeping

@youknowone youknowone Jun 22, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minimize diff and keep rustpython-ruff_python_parser as commented

# existing crate names in the codebase.
ruff_python_parser = { package = "rustpython-ruff_python_parser", version = "0.15.8" }
ruff_python_ast = { package = "rustpython-ruff_python_ast", version = "0.15.8" }
ruff_text_size = { package = "rustpython-ruff_text_size", version = "0.15.8" }
ruff_source_file = { package = "rustpython-ruff_source_file", version = "0.15.8" }
# To update ruff crates, comment out the above lines and uncomment the following lines to pull directly from the Ruff repository at the specified commit hash.
# Ruff tag 0.15.8 is based on commit c2a8815842f9dc5d24ec19385eae0f1a7188b0d9
# at the time of this capture. We use the commit hash to ensure reproducible builds.
# ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" }
# ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" }
# ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" }
# ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" }
# Use upstream Ruff directly while the RustPython-packaged Ruff crates lag
# behind the parser API used by this branch.
ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", rev = "6686f63404207bfdffe8ab0acb25da72c3432190" }
ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", rev = "6686f63404207bfdffe8ab0acb25da72c3432190" }
ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", rev = "6686f63404207bfdffe8ab0acb25da72c3432190" }
ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", rev = "6686f63404207bfdffe8ab0acb25da72c3432190" }
# ruff_python_parser = { package = "rustpython-ruff_python_parser", version = "0.15.8" }
# ruff_python_ast = { package = "rustpython-ruff_python_ast", version = "0.15.8" }
# ruff_text_size = { package = "rustpython-ruff_text_size", version = "0.15.8" }
# ruff_source_file = { package = "rustpython-ruff_source_file", version = "0.15.8" }

der = { version = "0.8", features = ["alloc", "oid", "pem", "zeroize"] }
phf = { version = "0.13.1", default-features = false, features = ["macros"]}
Expand Down Expand Up @@ -311,6 +308,7 @@
textwrap = { version = "0.16.2", default-features = false }
termios = "0.3.3"
thiserror = "2.0"
thin-vec = "0.2.14"
timsort = "0.1.2"
tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
icu_casemap = "2"
Expand Down
Loading
Loading