Skip to content

[ty] fix build failure caused by conflicts between #21683 and #21800#21802

Merged
carljm merged 1 commit intoastral-sh:mainfrom
mtshiba:fix-build-failure
Dec 5, 2025
Merged

[ty] fix build failure caused by conflicts between #21683 and #21800#21802
carljm merged 1 commit intoastral-sh:mainfrom
mtshiba:fix-build-failure

Conversation

@mtshiba
Copy link
Collaborator

@mtshiba mtshiba commented Dec 5, 2025

Summary

Test Plan

@carljm
Copy link
Contributor

carljm commented Dec 5, 2025

Thanks. CI jobs are failing trying to build main, not this PR.

@carljm carljm merged commit 10de342 into astral-sh:main Dec 5, 2025
35 of 40 checks passed
@mtshiba mtshiba deleted the fix-build-failure branch December 5, 2025 02:21
@codspeed-hq
Copy link

codspeed-hq bot commented Dec 5, 2025

CodSpeed Performance Report

Merging #21802 will degrade performances by 9.71%

Comparing mtshiba:fix-build-failure (b0daf7c) with main (a9de6b5)1

Summary

❌ 1 regression
✅ 21 untouched
⏩ 30 skipped2

⚠️ Please fix the performance issues or acknowledge them on CodSpeed.

Benchmarks breakdown

Mode Benchmark BASE HEAD Change
Simulation ty_micro[many_string_assignments] 76.6 ms 84.9 ms -9.71%

Footnotes

  1. No successful run was found on main (3511b7a) during the generation of this report, so a9de6b5 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

  2. 30 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@AlexWaygood AlexWaygood added internal An internal refactor or improvement ty Multi-file analysis & type inference labels Dec 5, 2025
dcreager added a commit that referenced this pull request Dec 5, 2025
* origin/main: (41 commits)
  [ty] Carry generic context through when converting class into `Callable` (#21798)
  [ty] Add more tests for renamings (#21810)
  [ty] Minor improvements to `assert_type` diagnostics (#21811)
  [ty] Add some attribute/method renaming test cases (#21809)
  Update mkdocs-material to 9.7.0 (Insiders now free) (#21797)
  Remove unused whitespaces in test cases (#21806)
  [ty] fix panic when instantiating a type variable with invalid constraints (#21663)
  [ty] fix build failure caused by conflicts between #21683 and #21800 (#21802)
  [ty] do nothing with `store_expression_type` if `inner_expression_inference_state` is `Get` (#21718)
  [ty] increase the limit on the number of elements in a non-recursively defined literal union (#21683)
  [ty] normalize typevar bounds/constraints in cycles (#21800)
  [ty] Update completion eval to include modules
  [ty] Add modules to auto-import
  [ty] Add support for module-only import requests
  [ty] Refactor auto-import symbol info
  [ty] Clarify the use of `SymbolKind` in auto-import
  [ty] Redact ranking of completions from e2e LSP tests
  [ty] Tweaks tests to use clearer language
  [ty] Update evaluation results
  [ty] Make auto-import ignore symbols in modules starting with a `_`
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

internal An internal refactor or improvement ty Multi-file analysis & type inference

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants