Skip to content

Update Optional[x] -> x | None and Union[x, y] to x | y#26633

Merged
simon-mo merged 33 commits intovllm-project:mainfrom
hmellor:update-typing-syntax
Oct 12, 2025
Merged

Update Optional[x] -> x | None and Union[x, y] to x | y#26633
simon-mo merged 33 commits intovllm-project:mainfrom
hmellor:update-typing-syntax

Conversation

@hmellor
Copy link
Copy Markdown
Member

@hmellor hmellor commented Oct 11, 2025 •
edited by github-actions bot
Loading

Removes all UP rule ignores from pyproject.toml now that we no longer support Python 3.9 #26247.

This will be the last repo-wide formatting PR for a long time.

Thank you everyone for persevering with these changes. They will be good for the long-term health of the codebase.

@hmellor
Update Optional[x] -> x | None and Union[x, y] to x | y
2b9ec20 
There are still some left so I have not updated the rules in `pyproject.toml` (I didn't have time to resolve them all). The follow up PR shouldn't take long or be too disruptive.

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Remove skip for rule UP045 (Optional -> |)
d509777 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix a couple more unions
18c0cae 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
tuple[list[str]] to list[str] in Qwen MoE` packed_modules_mapping
d8f8b2e 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor hmellor requested a review from noooop as a code owner October 12, 2025 09:55
@hmellor
Merge branch 'main' into update-typing-syntax
64850ed
@hmellor
pre-commit from main
f0ed6e6 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor hmellor mentioned this pull request Oct 12, 2025
Merged
5 tasks
hmellor added 10 commits October 12, 2025 12:42
@hmellor
Remove from __future__ import annotations because we no longer need it
73bda1a 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix some more unions
8984b34 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix the rest of the unions
ef333a0 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Use forward reference for generic type
bf62308 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix a bunch of forward references
1777484 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Add from __future__ import annotations back to lm format enforcer b…
6eb5320 
…ecause it's not used for `|`

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix bad forward reference
4ffcc9c 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Fix another bad forward import
83dbc75 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
More forward references
a8cf5af 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Hopefully final fix for forward references
76ee29b 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
@hmellor
Copy link
Copy Markdown
Member Author

hmellor commented Oct 12, 2025

There are lots of forward reference fixes because they were masked by from __future__ import annotations. These imports have been removed so that we don't have any implicit forward references.

@simon-mo simon-mo disabled auto-merge October 12, 2025 16:51
@simon-mo simon-mo merged commit 8fcaaf6 into vllm-project:main Oct 12, 2025
82 of 84 checks passed
@andylolu2
Copy link
Copy Markdown
Contributor

andylolu2 commented Oct 12, 2025

@hmellor just FYI I believe this PR missed some changes, pre-commit seems to be failing on main
https://github.com/vllm-project/vllm/actions/runs/18446887777/job/52554866861

Error: vllm/model_executor/models/bert.py:612:23: F821 Undefined name `Optional`
Error: vllm/model_executor/models/bert.py:613:23: F821 Undefined name `Optional`

@hmellor
Copy link
Copy Markdown
Member Author

hmellor commented Oct 12, 2025

Thanks for letting me know. This can happen when making changes to pre-commit rules if other PRs merge but don't cause conflicts. I'll forward fix it

@hmellor
Copy link
Copy Markdown
Member Author

hmellor commented Oct 12, 2025

Looks like someone beat me to it #26665

@hmellor hmellor mentioned this pull request Oct 13, 2025
Merged
@22quinn 22quinn mentioned this pull request Oct 19, 2025
Merged
5 tasks
@DarkLight1337 DarkLight1337 mentioned this pull request Dec 15, 2025
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@youkaichao youkaichao youkaichao approved these changes

@DarkLight1337 DarkLight1337 DarkLight1337 approved these changes

@NickLucche NickLucche Awaiting requested review from NickLucche NickLucche is a code owner

@gshtras gshtras Awaiting requested review from gshtras gshtras is a code owner

@patrickvonplaten patrickvonplaten Awaiting requested review from patrickvonplaten patrickvonplaten is a code owner

@luccafong luccafong Awaiting requested review from luccafong luccafong is a code owner

@sighingnow sighingnow Awaiting requested review from sighingnow sighingnow is a code owner

@jikunshang jikunshang Awaiting requested review from jikunshang jikunshang is a code owner

@bigPYJ1151 bigPYJ1151 Awaiting requested review from bigPYJ1151 bigPYJ1151 is a code owner

@ApostaC ApostaC Awaiting requested review from ApostaC ApostaC is a code owner

@tdoublep tdoublep Awaiting requested review from tdoublep tdoublep is a code owner

@jeejeelee jeejeelee Awaiting requested review from jeejeelee jeejeelee is a code owner

@WoosukKwon WoosukKwon Awaiting requested review from WoosukKwon WoosukKwon is a code owner

@robertgshaw2-redhat robertgshaw2-redhat Awaiting requested review from robertgshaw2-redhat robertgshaw2-redhat is a code owner

@njhill njhill Awaiting requested review from njhill njhill is a code owner

@ywang96 ywang96 Awaiting requested review from ywang96 ywang96 is a code owner

@comaniac comaniac Awaiting requested review from comaniac

@alexm-redhat alexm-redhat Awaiting requested review from alexm-redhat alexm-redhat is a code owner

@heheda12345 heheda12345 Awaiting requested review from heheda12345 heheda12345 is a code owner

@mgoin mgoin Awaiting requested review from mgoin mgoin is a code owner

@yewentao256 yewentao256 Awaiting requested review from yewentao256 yewentao256 is a code owner

@tlrmchlsmth tlrmchlsmth Awaiting requested review from tlrmchlsmth tlrmchlsmth is a code owner

@simon-mo simon-mo Awaiting requested review from simon-mo

@aarnphm aarnphm Awaiting requested review from aarnphm aarnphm is a code owner

@russellb russellb Awaiting requested review from russellb russellb is a code owner

@benchislett benchislett Awaiting requested review from benchislett benchislett is a code owner

@22quinn 22quinn Awaiting requested review from 22quinn 22quinn is a code owner

@houseroad houseroad Awaiting requested review from houseroad houseroad is a code owner

@LucasWilkinson LucasWilkinson Awaiting requested review from LucasWilkinson LucasWilkinson is a code owner

@ProExpertProg ProExpertProg Awaiting requested review from ProExpertProg ProExpertProg is a code owner

@zou3519 zou3519 Awaiting requested review from zou3519 zou3519 is a code owner

@chaunceyjiang chaunceyjiang Awaiting requested review from chaunceyjiang chaunceyjiang is a code owner

@zhuohan123 zhuohan123 Awaiting requested review from zhuohan123

@noooop noooop Awaiting requested review from noooop noooop is a code owner

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@sangstar sangstar

Labels

deepseek Related to DeepSeek models documentation Improvements or additions to documentation frontend gpt-oss Related to GPT-OSS models kv-connector llama Related to Llama models multi-modality Related to multi-modality (#4194) new-model Requests to new models performance Performance-related issues qwen Related to Qwen models ready ONLY add when PR is ready to merge/full CI is needed rocm Related to AMD ROCm speculative-decoding structured-output tool-calling tpu Related to Google TPUs v1

Projects

Structured Output
Status: Done
Tool Calling
Status: Done
gpt-oss Issues & Enhancements
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@hmellor @andylolu2 @youkaichao @DarkLight1337 @simon-mo @sangstar