Skip to content

Commit 8f66823

Browse files
committed
Merge remote-tracking branch 'origin/main' into dcreager/pep-self
* origin/main: (38 commits) [ty] Make implicit submodule imports only occur in global scope (#21370) [ty] introduce local variables for `from` imports of submodules in `__init__.py(i)` (#21173) [`ruff`] Ignore `str()` when not used for simple conversion (`RUF065`) (#21330) [ty] implement `typing.NewType` by adding `Type::NewTypeInstance` [ty] supress inlay hints for `+1` and `-1` (#21368) [ty] Use type context for inference of generic constructors (#20933) [ty] Improve generic call expression inference (#21210) [ty] supress some trivial expr inlay hints (#21367) [`configuration`] Fix unclear error messages for line-length values exceeding `u16::MAX` (#21329) [ty] Fix incorrect inference of `enum.auto()` for enums with non-`int` mixins, and imprecise inference of `enum.auto()` for single-member enums (#20541) [`refurb`] Detect empty f-strings (`FURB105`) (#21348) [ty] provide `import` completion when in `from <name> <name>` statement (#21291) [ty] elide redundant inlay hints for function args (#21365) Fix syntax error false positive on alternative `match` patterns (#21362) Add a new "Opening a PR" section to the contribution guide (#21298) [`flake8-simplify`] Fix SIM222 false positive for `tuple(generator) or None` (`SIM222`) (#21187) Rebuild ruff binary instead of sharing it across jobs (#21361) [ty] Fix `--exclude` and `src.exclude` merging (#21341) [ty] Add support for properties that return `Self` (#21335) Add upstream linter URL to `ruff linter --output-format=json` (#21316) ...
2 parents 4761f2d + 9ce3230 commit 8f66823

File tree

95 files changed

+5391
-1397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+5391
-1397
lines changed

.github/workflows/ci.yaml

Lines changed: 110 additions & 99 deletions
Large diffs are not rendered by default.

.github/workflows/mypy_primer.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,15 @@ jobs:
5959
run: |
6060
cd ruff
6161
scripts/mypy_primer.sh
62-
echo ${{ github.event.number }} > ../pr-number
6362
63+
# NOTE: astral-sh-bot uses this artifact to post comments on PRs.
64+
# Make sure to update the bot if you rename the artifact.
6465
- name: Upload diff
6566
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6667
with:
6768
name: mypy_primer_diff
6869
path: mypy_primer.diff
6970

70-
- name: Upload pr-number
71-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
72-
with:
73-
name: pr-number
74-
path: pr-number
75-
7671
memory_usage:
7772
name: Run memory statistics
7873
runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}

.github/workflows/mypy_primer_comment.yaml

Lines changed: 0 additions & 122 deletions
This file was deleted.

.github/workflows/pr-comment.yaml

Lines changed: 0 additions & 88 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
# we specify bash to get pipefail; it guards against the `curl` command
6969
# failing. otherwise `sh` won't catch that `curl` returned non-0
7070
shell: bash
71-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh"
71+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.2/cargo-dist-installer.sh | sh"
7272
- name: Cache dist
7373
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
7474
with:
@@ -166,8 +166,8 @@ jobs:
166166
- custom-build-binaries
167167
- custom-build-docker
168168
- build-global-artifacts
169-
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
170-
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }}
169+
# Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
170+
if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }}
171171
env:
172172
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
173173
runs-on: "depot-ubuntu-latest-4"

.github/workflows/sync_typeshed.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ jobs:
207207
uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
208208
- name: "Install cargo nextest"
209209
if: ${{ success() }}
210-
uses: taiki-e/install-action@81ee1d48d9194cdcab880cbdc7d36e87d39874cb # v2.62.45
210+
uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
211211
with:
212212
tool: cargo-nextest
213213
- name: "Install cargo insta"
214214
if: ${{ success() }}
215-
uses: taiki-e/install-action@81ee1d48d9194cdcab880cbdc7d36e87d39874cb # v2.62.45
215+
uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
216216
with:
217217
tool: cargo-insta
218218
- name: Update snapshots

.github/workflows/ty-ecosystem-analyzer.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ jobs:
112112
113113
cat diff-statistics.md >> "$GITHUB_STEP_SUMMARY"
114114
115-
echo ${{ github.event.number }} > pr-number
116-
117115
- name: "Deploy to Cloudflare Pages"
118116
if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
119117
id: deploy
@@ -131,18 +129,14 @@ jobs:
131129
echo >> comment.md
132130
echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md
133131
132+
# NOTE: astral-sh-bot uses this artifact to post comments on PRs.
133+
# Make sure to update the bot if you rename the artifact.
134134
- name: Upload comment
135135
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
136136
with:
137137
name: comment.md
138138
path: comment.md
139139

140-
- name: Upload pr-number
141-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
142-
with:
143-
name: pr-number
144-
path: pr-number
145-
146140
- name: Upload diagnostics diff
147141
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
148142
with:

.github/workflows/ty-ecosystem-analyzer_comment.yaml

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)