sync upstream #4

lmaotrigine · 2024-10-19T16:10:39Z

No description provided.

Co-authored-by: Alex Waygood <[email protected]>

@carljm

…s and rhs are the exact same type (astral-sh#13823) ## Summary This fixes an edge case that @carljm and I missed when implementing astral-sh#13800. Namely, if the left-hand operand is the _exact same type_ as the right-hand operand, the reflected dunder on the right-hand operand is never tried: ```pycon >>> class Foo: ... def __radd__(self, other): ... return 42 ... >>> Foo() + Foo() Traceback (most recent call last): File "<python-input-1>", line 1, in <module> Foo() + Foo() ~~~~~~^~~~~~~ TypeError: unsupported operand type(s) for +: 'Foo' and 'Foo' ``` This edge case _is_ covered in Brett's blog at https://snarky.ca/unravelling-binary-arithmetic-operations-in-python/, but I missed it amongst all the other subtleties of this algorithm. The motivations and history behind it were discussed in https://mail.python.org/archives/list/[email protected]/thread/7NZUCODEAPQFMRFXYRMGJXDSIS3WJYIV/ ## Test Plan I added an mdtest for this cornercase.

…tral-sh#13819) ## Summary - Refactored comparison type inference functions in `infer.rs`: Changed the return type from `Option` to `Result` to lay the groundwork for providing more detailed diagnostics. - Updated diagnostic messages. This is a small step toward improving diagnostics in the future. Please refer to astral-sh#13787 ## Test Plan mdtest included! --------- Co-authored-by: Carl Meyer <[email protected]>

…al-sh#13803) Implemented some points from astral-sh#12701 - Handle Unknown and Any in Unary operation - Handle Boolean in binary operations - Handle instances in unary operation - Consider division by False to be division by zero --------- Co-authored-by: Carl Meyer <[email protected]> Co-authored-by: Alex Waygood <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Micha Reiser <[email protected]>

Co-authored-by: Alex Waygood <[email protected]> Co-authored-by: Micha Reiser <[email protected]>

Remove unnecessary uses of `.as_ref()`, `.iter()`, `&**` and similar, mostly in situations when iterating over variables. Many of these changes are only possible following astral-sh#13826, when we bumped our MSRV to 1.80: several useful implementations on `&Box<[T]>` were only stabilised in Rust 1.80. Some of these changes we could have done earlier, however.

Use the modern `cargo::KEY=VALUE` syntax that was stabilised in MSRV 1.77, rather than the deprecated `cargo:KEY=VALUE` syntax.

This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [tomli_w](https://redirect.github.com/hukkin/tomli-w) ([changelog](https://redirect.github.com/hukkin/tomli-w/blob/master/CHANGELOG.md)) | `==1.0.0` -> `==1.1.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/tomli_w/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/tomli_w/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/tomli_w/1.0.0/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/tomli_w/1.0.0/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>hukkin/tomli-w (tomli_w)</summary> ### [`v1.1.0`](https://redirect.github.com/hukkin/tomli-w/blob/HEAD/CHANGELOG.md#110) [Compare Source](https://redirect.github.com/hukkin/tomli-w/compare/1.0.0...1.1.0) - Removed - Support for Python 3.7 and 3.8 - Added - Accept generic `collections.abc.Mapping`, not just `dict`, as input. Thank you [Watal M. Iwasaki](https://redirect.github.com/heavywatal) for the [PR](https://redirect.github.com/hukkin/tomli-w/pull/46). - `indent` keyword argument for customizing indent width of arrays. Thank you [Wim Jeantine-Glenn](https://redirect.github.com/wimglenn) for the [PR](https://redirect.github.com/hukkin/tomli-w/pull/49). - Type annotations - Type annotate `dump` function's output stream object as `typing.IO[bytes]` (previously `typing.BinaryIO`) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/astral-sh/ruff).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [abravalheri/validate-pyproject](https://redirect.github.com/abravalheri/validate-pyproject) | repository | minor | `v0.20.2` -> `v0.21` | | [astral-sh/ruff-pre-commit](https://redirect.github.com/astral-sh/ruff-pre-commit) | repository | minor | `v0.6.9` -> `v0.7.0` | | [crate-ci/typos](https://redirect.github.com/crate-ci/typos) | repository | minor | `v1.25.0` -> `v1.26.0` | | [executablebooks/mdformat](https://redirect.github.com/executablebooks/mdformat) | repository | patch | `0.7.17` -> `0.7.18` | Note: The `pre-commit` manager in Renovate is not supported by the `pre-commit` maintainers or community. Please do not report any problems there, instead [create a Discussion in the Renovate repository](https://redirect.github.com/renovatebot/renovate/discussions/new) if you have any questions. --- ### Release Notes <details> <summary>abravalheri/validate-pyproject (abravalheri/validate-pyproject)</summary> ### [`v0.21`](https://redirect.github.com/abravalheri/validate-pyproject/releases/tag/v0.21) [Compare Source](https://redirect.github.com/abravalheri/validate-pyproject/compare/v0.20.2...v0.21) #### What's Changed - Added support PEP 735 by [@&astral-sh#8203;henryiii](https://redirect.github.com/henryiii) in [https://github.com/abravalheri/validate-pyproject/pull/208](https://redirect.github.com/abravalheri/validate-pyproject/pull/208) - Added support PEP 639 by [@&astral-sh#8203;henryiii](https://redirect.github.com/henryiii) in [https://github.com/abravalheri/validate-pyproject/pull/210](https://redirect.github.com/abravalheri/validate-pyproject/pull/210) - Renamed testing extra to test by [@&astral-sh#8203;henryiii](https://redirect.github.com/henryiii) in [https://github.com/abravalheri/validate-pyproject/pull/212](https://redirect.github.com/abravalheri/validate-pyproject/pull/212) - General updates in CI setup **Full Changelog**: abravalheri/validate-pyproject@v0.20.2...v0.21 </details> <details> <summary>astral-sh/ruff-pre-commit (astral-sh/ruff-pre-commit)</summary> ### [`v0.7.0`](https://redirect.github.com/astral-sh/ruff-pre-commit/releases/tag/v0.7.0) [Compare Source](https://redirect.github.com/astral-sh/ruff-pre-commit/compare/v0.6.9...v0.7.0) See: https://github.com/astral-sh/ruff/releases/tag/0.7.0 </details> <details> <summary>crate-ci/typos (crate-ci/typos)</summary> ### [`v1.26.0`](https://redirect.github.com/crate-ci/typos/releases/tag/v1.26.0) [Compare Source](https://redirect.github.com/crate-ci/typos/compare/v1.25.0...v1.26.0) #### \[1.26.0] - 2024-10-07 ##### Compatibility - *(pre-commit)* Requires 3.2+ ##### Fixes - *(pre-commit)* Resolve deprecations in 4.0 about deprecated stage names </details> <details> <summary>executablebooks/mdformat (executablebooks/mdformat)</summary> ### [`v0.7.18`](https://redirect.github.com/executablebooks/mdformat/compare/0.7.17...0.7.18) [Compare Source](https://redirect.github.com/executablebooks/mdformat/compare/0.7.17...0.7.18) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/astral-sh/ruff).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…terals (`PLC0208`) (astral-sh#13731)

…sh#13856) ## Summary - Consistent naming: `BoolLiteral` => `BooleanLiteral` (it's mainly the `Ty::BoolLiteral` variant that was renamed) I tripped over this a few times now, so I thought I'll smooth it out. - Add a new test case for `Literal[True] <: bool`, as suggested here: astral-sh#13781 (comment)

## Summary Just a drive-by change that occurred to me while I was looking at `Type::is_subtype_of`: the existing pattern for unions on the *right hand side*: ```rs (ty, Type::Union(union)) => union .elements(db) .iter() .any(|&elem_ty| ty.is_subtype_of(db, elem_ty)), ``` is not (generally) correct if the *left hand side* is a union. ## Test Plan Added new test cases for `is_subtype_of` and `!is_subtype_of`

Co-authored-by: Alex Waygood <[email protected]>

## Summary A small fix for comparisons of multiple comparators. Instead of comparing each comparator to the leftmost item, we should compare it to the closest item on the left. While implementing this, I noticed that we don’t yet narrow Yoda comparisons (e.g., `True is x`), so I didn’t change that behavior in this PR. ## Test Plan Added some mdtests 🎉

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Add type narrowing for `!=` expression as stated in astral-sh#13694. ### Test Plan Add tests in new md format. --------- Co-authored-by: David Peter <[email protected]>

…e, not the test snippet (astral-sh#13804) Co-authored-by: Alex Waygood <[email protected]> Co-authored-by: Micha Reiser <[email protected]> Co-authored-by: Carl Meyer <[email protected]>

…al-sh#13876) Add the following subtype relations: - `BooleanLiteral <: object` - `IntLiteral <: object` - `StringLiteral <: object` - `LiteralString <: object` - `BytesLiteral <: object` Added a test case for `bool <: int`. ## Test Plan New unit tests.

…h#13274) ## Summary This PR updates `ruff` to match `uv` updated [docker releases approach](https://github.com/astral-sh/uv/blob/main/.github/workflows/build-docker.yml). It's a combined PR with changes from these PR's * astral-sh/uv#6053 * astral-sh/uv#6556 * astral-sh/uv#6734 * astral-sh/uv#7568 Summary of changes / features 1. This change would publish an additional tags that includes only `major.minor`. For a release with `x.y.z`, this would publish the tags: * ghcr.io/astral-sh/ruff:latest * ghcr.io/astral-sh/ruff:x.y.z * ghcr.io/astral-sh/ruff:x.y 2. Parallelizes multi-platform builds using multiple workers (hence the new docker-build / docker-publish jobs), which cuts docker releases time in half. 3. This PR introduces additional images with the ruff binaries from scratch for both amd64/arm64 and makes the mapping easy to configure by generating the Dockerfile on the fly. This approach focuses on minimizing CI time by taking advantage of dedicating a worker per mapping (20-30s~ per job). For example, on release `x.y.z`, this will publish the following image tags with format `ghcr.io/astral-sh/ruff:{tag}` with manifests for both amd64/arm64. This also include `x.y` tags for each respective additional tag. Note, this version does not include the python based images, unlike `uv`. * From **scratch**: `latest`, `x.y.z`, `x.y` (currently being published) * From **alpine:3.20**: `alpine`, `alpine3.20`, `x.y.z-alpine`, `x.y.z-alpine3.20` * From **debian:bookworm-slim**: `debian-slim`, `bookworm-slim`, `x.y.z-debian-slim`, `x.y.z-bookworm-slim` * From **buildpack-deps:bookworm**: `debian`, `bookworm`, `x.y.z-debian`, `x.y.z-bookworm` 4. This PR also fixes `org.opencontainers.image.version` for all tags (including the one from `scratch`) to contain the right release version instead of branch name `main` (current behavior). ``` > docker inspect ghcr.io/astral-sh/ruff:0.6.4 | jq -r '.[0].Config.Labels' { ... "org.opencontainers.image.version": "main" } ``` Closes astral-sh#13481 ## Test Plan Approach mimics `uv` with almost no changes so risk is low but I still tested the full workflow. * I have a working CI release pipeline on my fork run https://github.com/samypr100/ruff/actions/runs/10966657733 * The resulting images were published to https://github.com/samypr100/ruff/pkgs/container/ruff

…it is enabled (astral-sh#13867)

…plification (astral-sh#13880) ## Summary - Properly treat the empty intersection as being of type `object`. - Consequently, change the simplification method to explicitly add `Never` to the positive side of the intersection when collapsing a type such as `int & str` to `Never`, as opposed to just clearing both the positive and the negative side. - Minor code improvement in `bindings_ty`: use `peekable()` to check whether the iterator over constraints is empty, instead of handling first and subsequent elements separately. fixes astral-sh#13870 ## Test Plan - New unit tests for `IntersectionBuilder` to make sure the empty intersection represents `object`. - Markdown-based regression test for the original issue in astral-sh#13870

…iteral (astral-sh#13873) ## Summary * Rename `Type::Class` => `Type::ClassLiteral` * Rename `Type::Function` => `Type::FunctionLiteral` * Do not rename `Type::Module` * Remove `*Literal` suffixes in `display::LiteralTypeKind` variants, as per clippy suggestion * Get rid of `Type::is_class()` in favor of `is_subtype_of(…, 'type')`; modifiy `is_subtype_of` to support this. * Add new `Type::is_xyz()` methods and use them instead of matching on `Type` variants. closes astral-sh#13863 ## Test Plan New `is_subtype_of_class_literals` unit test. --------- Co-authored-by: Alex Waygood <[email protected]>

…3860)

## Summary A minor quality-of-life improvement: add [`#[track_caller]`](https://doc.rust-lang.org/reference/attributes/codegen.html#the-track_caller-attribute) attribute to `Type::expect_xyz()` methods and some `TypeInference` methods such that the panic-location is reported one level higher up in the stack trace. before: reports location inside the `Type::expect_class_literal()` method. Not very useful. ``` thread 'types::infer::tests::deferred_annotation_builtin' panicked at crates/red_knot_python_semantic/src/types.rs:304:14: Expected a Type::ClassLiteral variant ``` after: reports location at the `Type::expect_class_literal()` call site, where the error was made. ``` thread 'types::infer::tests::deferred_annotation_builtin' panicked at crates/red_knot_python_semantic/src/types/infer.rs:4302:14: Expected a Type::ClassLiteral variant ``` ## Test Plan Called `expect_class_literal()` on something that's not a `Type::ClassLiteral` and saw that the error was reported at the call site.

…n quotes (astral-sh#11811) ## Summary This PR updates the fix generation logic for auto-quoting an annotation to generate an edit even when there's a quote character present. The logic uses the visitor pattern, maintaining it's state on where it is and generating the string value one node at a time. This can be considered as a specialized form of `Generator`. The state required to maintain is whether we're currently inside a `typing.Literal` or `typing.Annotated` because the string value in those types should not be un-quoted i.e., `Generic[Literal["int"]]` should become `"Generic[Literal['int']]`, the quotes inside the `Literal` should be preserved. Fixes: astral-sh#9137 ## Test Plan Add various test cases to validate this change, validate the snapshots. There are no ecosystem changes to go through. --------- Signed-off-by: Shaygan <[email protected]> Co-authored-by: Dhruv Manilawala <[email protected]>

…rator (astral-sh#13890)

## Summary Add type narrowing for `isinstance(object, classinfo)` [1] checks: ```py x = 1 if flag else "a" if isinstance(x, int): reveal_type(x) # revealed: Literal[1] ``` closes astral-sh#13893 [1] https://docs.python.org/3/library/functions.html#isinstance ## Test Plan New Markdown-based tests in `narrow/isinstance.md`. --------- Co-authored-by: Alex Waygood <[email protected]>

## Summary `ruff check` has not been the default in a long time. However, the help message and code comment still designate it as the default. The remark should have been removed in the deprecation PR astral-sh#10169. ## Test Plan Not tested.

…#13663)

…l-sh#13901) ## Summary Infer subscript expression types for bytes literals: ```py b = b"\x00abc\xff" reveal_type(b[0]) # revealed: Literal[b"\x00"] reveal_type(b[1]) # revealed: Literal[b"a"] reveal_type(b[-1]) # revealed: Literal[b"\xff"] reveal_type(b[-2]) # revealed: Literal[b"c"] reveal_type(b[False]) # revealed: Literal[b"\x00"] reveal_type(b[True]) # revealed: Literal[b"a"] ``` part of astral-sh#13689 (astral-sh#13689 (comment)) ## Test Plan - New Markdown-based tests (see `mdtest/subscript/bytes.md`) - Added missing test for `string_literal[bool_literal]`

)

…tting_enabled (astral-sh#13907)

…al-sh#13910)

…, and 'unused_peekable' (astral-sh#13920)

## Summary Previously, this would fail with ``` AttributeError: 'str' object has no attribute 'is_file' ``` if I tried to use the `--knot-path` option. I wish we had a type checker for Python*. ## Test Plan ```sh uv run benchmark --knot-path ~/.cargo-target/release/red_knot ``` \* to be fair, this would probably require special handling for `argparse` in the typechecker.

…ions (astral-sh#13908)

Co-authored-by: Alex Waygood <[email protected]>

## Summary Add support for type narrowing in elif and else scopes as part of astral-sh#13694. ## Test Plan - mdtest - builder unit test for union negation. --------- Co-authored-by: Carl Meyer <[email protected]>

carljm and others added 30 commits October 19, 2024 15:22

[red-knot] binary arithmetic on instances (astral-sh#13800)

f4b5e70

Co-authored-by: Alex Waygood <[email protected]>

[python_ast] Make the iter_mut functions public (astral-sh#13542)

2d2baec

Update BREAKING_CHANGES.md for Ruff 0.7 (astral-sh#13828)

075e378

Bump MSRV to Rust 1.80 (astral-sh#13826)

27c50be

Update Rust crate pep440_rs to 0.7.1 (astral-sh#13654)

7ca3571

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Micha Reiser <[email protected]>

[red-knot] Cleanup generated names of mdtest tests (astral-sh#13831)

7fd8e30

Co-authored-by: Alex Waygood <[email protected]> Co-authored-by: Micha Reiser <[email protected]>

Modernize build scripts (astral-sh#13837)

02bca9a

Use the modern `cargo::KEY=VALUE` syntax that was stabilised in MSRV 1.77, rather than the deprecated `cargo:KEY=VALUE` syntax.

Update dependency mdformat to v0.7.18 (astral-sh#13843)

efa798b

Update dependency ruff to v0.7.0 (astral-sh#13847)

a5d52b0

Update Rust crate libc to v0.2.161 (astral-sh#13840)

c9b74ed

Update Rust crate anyhow to v1.0.90 (astral-sh#13839)

ca8f108

Update Rust crate proc-macro2 to v1.0.88 (astral-sh#13841)

7060bf8

Update Rust crate syn to v2.0.82 (astral-sh#13842)

cf26676

Update Rust crate fern to 0.7.0 (astral-sh#13844)

19a2fd1

Update Rust crate serde_json to v1.0.132 (astral-sh#13848)

9477058

Update Rust crate uuid to v1.11.0 (astral-sh#13845)

a80d515

[pylint] - restrict iteration-over-set to only work on sets of li…

f3612c2

…terals (`PLC0208`) (astral-sh#13731)

Speed up mdtests (astral-sh#13832)

9e3cf14

Co-authored-by: Alex Waygood <[email protected]>

formatter: Introduce QuoteMetadata (astral-sh#13858)

e9dd921

Speedup mdtest parser (astral-sh#13835)

155be88

renovate bot and others added 28 commits October 21, 2024 20:53

Update cloudflare/wrangler-action action to v3.9.0 (astral-sh#13846)

e39110e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[red-knot] Support for not-equal narrowing (astral-sh#13749)

9d10279

Add type narrowing for `!=` expression as stated in astral-sh#13694. ### Test Plan Add tests in new md format. --------- Co-authored-by: David Peter <[email protected]>

[red-knot] Report line numbers in mdtest relative to the markdown fil…

cd6c937

…e, not the test snippet (astral-sh#13804) Co-authored-by: Alex Waygood <[email protected]> Co-authored-by: Micha Reiser <[email protected]> Co-authored-by: Carl Meyer <[email protected]>

Fix D204's documentation to correctly mention the conventions when …

5d4edd6

…it is enabled (astral-sh#13867)

Alternate quotes for strings inside f-strings in preview (astral-sh#1…

2f88f84

…3860)

Fix stale syntax errors in playground (astral-sh#13888)

00b0782

Fix E221 and E222 to flag missing or extra whitespace around == ope…

72c18c8

…rator (astral-sh#13890)

Use referencial equality in traversal helper methods (astral-sh#13895)

e402e27

Join implicit concatenated strings when they fit on a line (astral-sh…

73ee72b

…#13663)

[red-knot] Format mdtest Python snippets more concisely (astral-sh#13905

3eb4546

)

Fix preview style name in can_omit_parentheses to is_f_string_forma…

7272f83

…tting_enabled (astral-sh#13907)

Fix normalize arguments when fstring_formatting is disabled (astr…

113ce84

…al-sh#13910)

Bump version to 0.7.1 (astral-sh#13913)

337af83

Enable nursery rules: 'redundant_clone', 'debug_assert_with_mut_call'…

32b57b2

…, and 'unused_peekable' (astral-sh#13920)

[red-knot] Infer Todo, not Unknown, for PEP-604 unions in annotat…

5eb87aa

…ions (astral-sh#13908)

[red-knot] Remove lint-phase (astral-sh#13922)

6aaf1d9

Co-authored-by: Alex Waygood <[email protected]>

Docs: Add GitLab CI/CD to integrations. (astral-sh#13915)

3006d6d

[red-knot] Type narrow in else clause (astral-sh#13918)

35f007f

## Summary Add support for type narrowing in elif and else scopes as part of astral-sh#13694. ## Test Plan - mdtest - builder unit test for union negation. --------- Co-authored-by: Carl Meyer <[email protected]>

lmaotrigine merged commit 9f81f57 into lowercase-hex-numbers Oct 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sync upstream #4

sync upstream #4

lmaotrigine commented Oct 19, 2024

sync upstream #4

sync upstream #4

Conversation

lmaotrigine commented Oct 19, 2024