Add all PEP-585 names to UP006 rule #5454
Conversation
|
Hmm, I believe these are already covered by the deprecated import rule that we have in pyupgrade. There’s clearly some overlap in responsibilities between the two. |
Currently, from typing import List # Flagged by UP035
x: List # Flagged by UP006
import typing
x: typing.List # Flagged by UP006It definitely seems like something that could be merged into one rule, or we could have two (one for pep 585 and one for other deprecated names) which share their implementation. Also made me realise an issue with this PR currently: import typing
from typing import Sequence
x: Sequence
x: typing.Sequencecauses an error although weirdly when I actually run |
|
I think this originally arose from pyupgrade, which has two separate "rules" for deprecated imports vs. PEP 585 rewrites (for builtins only). Most deprecated imports can be fixed by only modifying the import site, since they typically involve members that were moved from one module to another. Meanwhile, the PEP 585 built-in rewrites don't require changing imports at all, since they only change to The current setup honestly seems okay to me (the PEP 585 rule deals with members that need to be renamed; the deprecated imports rule only fixes imports), but I'd probably also be okay with removing the PEP 585 imports from "deprecated imports" and moving them into this rule. Though it might be sort of complicated to pull off given how different the implementations are, and some of the quirks around how they'd need to be gated (e.g., you can rewrite
Yeah, that's right -- we iteratively fix up to a certain number of iterations. |
|
Thanks for explaining, I agree that it seems quite complicated to combine the rules, and removing the duplication of names would probably also require a decent amount of work. Maybe something that could be done at some point but I'm not sure it's necessary for this PR. I fixed the issue with the name conflict when both types of import are already there (the autofix for this case still works, it just needs the Does this look alright? |
|
Ah, this is great! It would be great to have this automated! |
|
@charliermarsh I think this is probably reasonable as discussed? |
|
I feel like this could be better suited to inclusion in UP035 -- since the deprecated imports flagged in there should be a superset of the PEP 585 changes. |
|
As an example: if someone does |
I can't think of a case that you'd want to have a rule to detect/fix from typing import List
x: Listbut not I would expect them to be treated as equivalent by a rule attempting to update to PEP 585 annotations.
I think that just suggests that would make sense to implement for |
|
| code | total | + violation | - violation | + fix | - fix |
|---|---|---|---|---|---|
| FA100 | 4 | 4 | 0 | 0 | 0 |
Linter (preview)
ℹ️ ecosystem check detected linter changes. (+2824 -0 violations, +0 -0 fixes in 22 projects; 33 projects unchanged)
aiven/aiven-client (+409 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview
+ aiven/client/argx.py:104:38: UP006 Use `collections.abc.Iterable` instead of `Iterable` for type annotation + aiven/client/argx.py:155:54: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + aiven/client/argx.py:171:45: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + aiven/client/argx.py:174:49: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + aiven/client/argx.py:241:29: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + aiven/client/argx.py:278:34: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + aiven/client/argx.py:278:44: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + aiven/client/argx.py:290:32: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation + aiven/client/argx.py:300:29: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + aiven/client/argx.py:303:34: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation ... 399 additional changes omitted for project
apache/airflow (+481 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview --select ALL
+ airflow/api/auth/backend/deny_all.py:34:24: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/parameters.py:87:24: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/parameters.py:90:52: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/parameters.py:90:78: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/security.py:114:6: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/security.py:161:54: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/security.py:180:53: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/security.py:199:57: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/security.py:218:54: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + airflow/api_connexion/security.py:237:6: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation ... 471 additional changes omitted for project
apache/superset (+167 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview --select ALL
+ scripts/check-env.py:37:40: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/advanced_data_type/types.py:58:21: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/advanced_data_type/types.py:59:23: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/cli/test_db.py:81:12: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/cli/test_db.py:88:38: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/commands/chart/export.py:80:30: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/commands/dashboard/export.py:168:30: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/commands/database/export.py:108:30: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/commands/dataset/export.py:87:30: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + superset/commands/dataset/importers/v0.py:129:22: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation ... 157 additional changes omitted for project
bokeh/bokeh (+250 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview --select ALL
+ release/action.py:27:31: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + release/action.py:27:52: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation + release/action.py:35:47: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation + release/build.py:144:22: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + release/credentials.py:37:22: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + release/credentials.py:40:38: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + release/pipeline.py:24:12: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + release/pipeline.py:34:31: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation + release/ui.py:103:33: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation + release/ui.py:24:17: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation ... 240 additional changes omitted for project
ibis-project/ibis (+3 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview
+ ibis/common/tests/test_patterns.py:1122:13: UP006 [*] Use `collections.abc.Callable` instead of `Callable` for type annotation + ibis/common/tests/test_patterns.py:1125:10: UP006 [*] Use `collections.abc.Callable` instead of `Callable` for type annotation + ibis/common/tests/test_patterns.py:731:31: UP006 [*] Use `collections.abc.Callable` instead of `Callable` for type annotation
langchain-ai/langchain (+299 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview
+ libs/core/langchain_core/_api/beta_decorator.py:128:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/beta_decorator.py:186:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/beta_decorator.py:201:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/beta_decorator.py:30:30: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/beta_decorator.py:39:6: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/deprecation.py:202:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/deprecation.py:232:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/deprecation.py:252:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/deprecation.py:268:47: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + libs/core/langchain_core/_api/deprecation.py:300:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation ... 289 additional changes omitted for project
lnbits/lnbits (+47 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview
+ lnbits/app.py:342:46: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + lnbits/app.py:352:47: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + lnbits/core/models.py:332:30: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + lnbits/core/models.py:333:31: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + lnbits/core/views/auth_api.py:340:49: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + lnbits/lnurl.py:24:36: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + lnbits/tasks.py:143:11: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + lnbits/tasks.py:143:31: UP006 Use `collections.abc.Coroutine` instead of `Coroutine` for type annotation + lnbits/tasks.py:144:19: UP006 Use `collections.abc.Coroutine` instead of `Coroutine` for type annotation + lnbits/tasks.py:144:6: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation ... 37 additional changes omitted for project
milvus-io/pymilvus (+1 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview
+ _version_helper.py:32:17: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation
mlflow/mlflow (+101 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview
+ dev/clint/src/clint/linter.py:110:42: UP006 Use `collections.abc.Iterator` instead of `Iterator` for type annotation + dev/set_matrix.py:317:56: UP006 Use `collections.abc.Iterator` instead of `Iterator` for type annotation + mlflow/bedrock/_autolog.py:46:35: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + mlflow/bedrock/_autolog.py:46:58: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + mlflow/data/dataset_registry.py:122:48: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + mlflow/data/dataset_registry.py:18:31: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + mlflow/data/dataset_registry.py:63:47: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + mlflow/data/dataset_registry.py:93:42: UP006 Use `collections.abc.Callable` instead of `Callable` for type annotation + mlflow/data/huggingface_dataset.py:180:37: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation + mlflow/data/huggingface_dataset.py:180:52: UP006 Use `collections.abc.Mapping` instead of `Mapping` for type annotation ... 91 additional changes omitted for project
pypa/build (+6 -0 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview
+ src/build/_builder.py:120:14: UP006 Use `collections.abc.Sequence` instead of `Sequence` for type annotation + src/build/_builder.py:120:68: UP006 Use `collections.abc.Mapping` instead of `Mapping` for type annotation + src/build/_builder.py:39:28: UP006 Use `collections.abc.Mapping` instead of `Mapping` for type annotation + src/build/_builder.py:60:44: UP006 Use `collections.abc.Mapping` instead of `Mapping` for type annotation + src/build/_builder.py:74:47: UP006 Use `collections.abc.Mapping` instead of `Mapping` for type annotation + src/build/_builder.py:74:69: UP006 Use `collections.abc.Mapping` instead of `Mapping` for type annotation
... Truncated remaining completed project reports due to GitHub comment length restrictions
Changes by rule (2 rules affected)
| code | total | + violation | - violation | + fix | - fix |
|---|---|---|---|---|---|
| UP006 | 2820 | 2820 | 0 | 0 | 0 |
| FA100 | 4 | 4 | 0 | 0 | 0 |
|
@AlexWaygood @charliermarsh could you two work together to determine a path forward on this one? |
|
Ok, I think it actually does make sense to add these here -- but they probably need to go under preview. You're right that it's silly that the first case triggers, but the second does not: from typing import AbstractSet
def f(x: AbstractSet[str]) -> None:
pass
import typing
def f(x: typing.AbstractSet[str]) -> None:
pass |
|
If you want to rebase and gate the new variants behind preview, I am happy to merge the change. |
dylwil3
force-pushed
the
more-UP006-detection
branch
from
3a46aeb to
2138d18
Compare
| pub fn as_pep_585_generic(call_path: &[&str]) -> Option<ModuleMember> { | ||
| match call_path { | ||
| // Builtins | ||
| ["typing" | "typing_extensions", "Tuple"] => Some(("", "tuple")), |
There was a problem hiding this comment.
nit: we can split this into two matches to short-circuit when the call path is not from typing / typing_extensions module like:
let ["typing" | "typing_extensions", member @ ..] = call_path else {
return None;
};
match member {
// Builtins
["Tuple"] => Some(("", "tuple")),
["List"] => Some(("", "list")),
// ...
}
Closes #3936
Summary
Building on #4420, adds the remaining PEP-585 names.
Test Plan
Added snapshot tests for a few cases.