Enable RUF018 rule for walrus assignments in asserts #18886

awaelchli · 2023-10-28T14:07:10Z

What does this PR do?

Enables this new rule in ruff: astral-sh/ruff#7205
We ran into this issue in #18496, and the new rule will prevent that in the future.

📚 Documentation preview 📚: https://pytorch-lightning--18886.org.readthedocs.build/en/18886/

cc @Borda @carmocca @justusschock @awaelchli

github-actions · 2023-10-28T14:07:44Z

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow

Check ID	Status
pl-cpu (macOS-11, lightning, 3.8, 1.12, oldest)	success	✅
pl-cpu (macOS-11, lightning, 3.9, 1.12)	success	✅
pl-cpu (macOS-11, lightning, 3.10, 1.13)	success	✅
pl-cpu (macOS-11, lightning, 3.10, 2.0)	success	✅
pl-cpu (macOS-11, lightning, 3.10, 2.1)	success	✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest)	success	✅
pl-cpu (ubuntu-20.04, lightning, 3.9, 1.12)	success	✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)	success	✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0)	success	✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)	success	✅
pl-cpu (windows-2022, lightning, 3.8, 1.12, oldest)	success	✅
pl-cpu (windows-2022, lightning, 3.9, 1.12)	success	✅
pl-cpu (windows-2022, lightning, 3.10, 1.13)	success	✅
pl-cpu (windows-2022, lightning, 3.10, 2.0)	success	✅
pl-cpu (windows-2022, lightning, 3.10, 2.1)	success	✅
pl-cpu (macOS-11, pytorch, 3.8, 1.13)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13)	success	✅
pl-cpu (windows-2022, pytorch, 3.8, 1.13)	success	✅
pl-cpu (macOS-12, pytorch, 3.11, 2.0)	success	✅
pl-cpu (macOS-12, pytorch, 3.11, 2.1)	success	✅
pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0)	success	✅
pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.1)	success	✅
pl-cpu (windows-2022, pytorch, 3.11, 2.0)	success	✅
pl-cpu (windows-2022, pytorch, 3.11, 2.1)	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/lr_monitor.py, src/lightning/pytorch/cli.py, tests/tests_pytorch/profilers/test_profiler.py, tests/tests_pytorch/trainer/properties/test_loggers.py, pyproject.toml.

🟢 pytorch_lightning: Azure GPU

Check ID	Status
pytorch-lightning (GPUs) (testing Lightning \| latest)	success	✅
pytorch-lightning (GPUs) (testing PyTorch \| latest)	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/lr_monitor.py, src/lightning/pytorch/cli.py, tests/tests_pytorch/profilers/test_profiler.py, tests/tests_pytorch/trainer/properties/test_loggers.py, pyproject.toml.

🟢 pytorch_lightning: Benchmarks

Check ID	Status
lightning.Benchmarks	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/lr_monitor.py, src/lightning/pytorch/cli.py.

🟢 fabric: Docs

Check ID	Status
docs-make (fabric, doctest)	success	✅
docs-make (fabric, html)	success	✅

These checks are required after the changes to pyproject.toml.

🟢 pytorch_lightning: Docs

Check ID	Status
docs-make (pytorch, doctest)	success	✅
docs-make (pytorch, html)	success	✅

These checks are required after the changes to src/lightning/pytorch/callbacks/lr_monitor.py, src/lightning/pytorch/cli.py, pyproject.toml.

🟢 lightning_data: CPU workflow

Check ID	Status
data-cpu (macOS-11, lightning, 3.10, 2.1)	success	✅
data-cpu (ubuntu-20.04, lightning, 3.10, 2.1)	success	✅
data-cpu (windows-2022, lightning, 3.10, 2.1)	success	✅

These checks are required after the changes to pyproject.toml.

🟢 lightning_fabric: CPU workflow

Check ID	Status
fabric-cpu (macOS-11, lightning, 3.8, 1.12, oldest)	success	✅
fabric-cpu (macOS-11, lightning, 3.9, 1.12)	success	✅
fabric-cpu (macOS-11, lightning, 3.10, 1.13)	success	✅
fabric-cpu (macOS-11, lightning, 3.10, 2.0)	success	✅
fabric-cpu (macOS-11, lightning, 3.11, 2.1)	success	✅
fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest)	success	✅
fabric-cpu (ubuntu-20.04, lightning, 3.9, 1.12)	success	✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13)	success	✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0)	success	✅
fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)	success	✅
fabric-cpu (windows-2022, lightning, 3.8, 1.12, oldest)	success	✅
fabric-cpu (windows-2022, lightning, 3.9, 1.12)	success	✅
fabric-cpu (windows-2022, lightning, 3.10, 1.13)	success	✅
fabric-cpu (windows-2022, lightning, 3.10, 2.0)	success	✅
fabric-cpu (windows-2022, lightning, 3.11, 2.1)	success	✅
fabric-cpu (macOS-11, fabric, 3.8, 1.13)	success	✅
fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13)	success	✅
fabric-cpu (windows-2022, fabric, 3.8, 1.13)	success	✅
fabric-cpu (macOS-12, fabric, 3.11, 2.0)	success	✅
fabric-cpu (macOS-12, fabric, 3.11, 2.1)	success	✅
fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0)	success	✅
fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.1)	success	✅
fabric-cpu (windows-2022, fabric, 3.11, 2.0)	success	✅
fabric-cpu (windows-2022, fabric, 3.11, 2.1)	success	✅

These checks are required after the changes to tests/tests_fabric/plugins/collectives/test_torch_collective.py, tests/tests_fabric/utilities/test_load.py, tests/tests_fabric/utilities/test_warnings.py, pyproject.toml.

🟢 lightning_fabric: Azure GPU

Check ID	Status
lightning-fabric (GPUs) (testing Fabric \| latest)	success	✅
lightning-fabric (GPUs) (testing Lightning \| latest)	success	✅

These checks are required after the changes to tests/tests_fabric/plugins/collectives/test_torch_collective.py, tests/tests_fabric/utilities/test_load.py, tests/tests_fabric/utilities/test_warnings.py, pyproject.toml.

🟢 lightning_app: Tests workflow

Check ID	Status
app-pytest (macOS-11, lightning, 3.8, latest)	success	✅
app-pytest (macOS-11, lightning, 3.8, oldest)	success	✅
app-pytest (macOS-11, app, 3.9, latest)	success	✅
app-pytest (macOS-12, app, 3.11, latest)	success	✅
app-pytest (ubuntu-20.04, lightning, 3.8, latest)	success	✅
app-pytest (ubuntu-20.04, lightning, 3.8, oldest)	success	✅
app-pytest (ubuntu-20.04, app, 3.9, latest)	success	✅
app-pytest (ubuntu-22.04, app, 3.11, latest)	success	✅
app-pytest (windows-2022, lightning, 3.8, latest)	success	✅
app-pytest (windows-2022, lightning, 3.8, oldest)	success	✅
app-pytest (windows-2022, app, 3.8, latest)	success	✅
app-pytest (windows-2022, app, 3.11, latest)	success	✅

These checks are required after the changes to src/lightning/app/cli/connect/app.py, src/lightning/app/source_code/tar.py, tests/tests_app/core/test_lightning_api.py, tests/tests_app/storage/test_copier.py, tests/tests_app/utilities/test_cli_helpers.py, tests/tests_app/utilities/test_exceptions.py.

🟢 lightning_app: Examples

Check ID	Status
app-examples (macOS-11, lightning, 3.9, latest)	success	✅
app-examples (macOS-11, lightning, 3.9, oldest)	success	✅
app-examples (macOS-11, app, 3.9, latest)	success	✅
app-examples (ubuntu-20.04, lightning, 3.9, latest)	success	✅
app-examples (ubuntu-20.04, lightning, 3.9, oldest)	success	✅
app-examples (ubuntu-20.04, app, 3.9, latest)	success	✅
app-examples (windows-2022, lightning, 3.9, latest)	success	✅
app-examples (windows-2022, lightning, 3.9, oldest)	success	✅
app-examples (windows-2022, app, 3.9, latest)	success	✅

These checks are required after the changes to src/lightning/app/cli/connect/app.py, src/lightning/app/source_code/tar.py.

🟢 lightning_app: Docs

Check ID	Status
docs-make (app, doctest)	success	✅
docs-make (app, html)	success	✅

These checks are required after the changes to src/lightning/app/cli/connect/app.py, src/lightning/app/source_code/tar.py, pyproject.toml.

🟢 mypy

Check ID	Status
mypy	success	✅

These checks are required after the changes to src/lightning/app/cli/connect/app.py, src/lightning/app/source_code/tar.py, src/lightning/pytorch/callbacks/lr_monitor.py, src/lightning/pytorch/cli.py, pyproject.toml.

🟢 install

Check ID	Status
install-pkg (ubuntu-22.04, app, 3.8)	success	✅
install-pkg (ubuntu-22.04, app, 3.11)	success	✅
install-pkg (ubuntu-22.04, fabric, 3.8)	success	✅
install-pkg (ubuntu-22.04, fabric, 3.11)	success	✅
install-pkg (ubuntu-22.04, pytorch, 3.8)	success	✅
install-pkg (ubuntu-22.04, pytorch, 3.11)	success	✅
install-pkg (ubuntu-22.04, lightning, 3.8)	success	✅
install-pkg (ubuntu-22.04, lightning, 3.11)	success	✅
install-pkg (ubuntu-22.04, notset, 3.8)	success	✅
install-pkg (ubuntu-22.04, notset, 3.11)	success	✅
install-pkg (macOS-12, app, 3.8)	success	✅
install-pkg (macOS-12, app, 3.11)	success	✅
install-pkg (macOS-12, fabric, 3.8)	success	✅
install-pkg (macOS-12, fabric, 3.11)	success	✅
install-pkg (macOS-12, pytorch, 3.8)	success	✅
install-pkg (macOS-12, pytorch, 3.11)	success	✅
install-pkg (macOS-12, lightning, 3.8)	success	✅
install-pkg (macOS-12, lightning, 3.11)	success	✅
install-pkg (macOS-12, notset, 3.8)	success	✅
install-pkg (macOS-12, notset, 3.11)	success	✅
install-pkg (windows-2022, app, 3.8)	success	✅
install-pkg (windows-2022, app, 3.11)	success	✅
install-pkg (windows-2022, fabric, 3.8)	success	✅
install-pkg (windows-2022, fabric, 3.11)	success	✅
install-pkg (windows-2022, pytorch, 3.8)	success	✅
install-pkg (windows-2022, pytorch, 3.11)	success	✅
install-pkg (windows-2022, lightning, 3.8)	success	✅
install-pkg (windows-2022, lightning, 3.11)	success	✅
install-pkg (windows-2022, notset, 3.8)	success	✅
install-pkg (windows-2022, notset, 3.11)	success	✅

These checks are required after the changes to src/lightning/app/cli/connect/app.py, src/lightning/app/source_code/tar.py, src/lightning/pytorch/callbacks/lr_monitor.py, src/lightning/pytorch/cli.py.

Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

for more information, see https://pre-commit.ci

codecov · 2023-10-28T14:15:00Z

Codecov Report

Merging #18886 (df738d6) into master (f6a36cf) will increase coverage by 9%.
The diff coverage is 75%.

Additional details and impacted files

@@            Coverage Diff            @@
##           master   #18886     +/-   ##
=========================================
+ Coverage      73%      82%     +9%     
=========================================
  Files         443      443             
  Lines       35417    35417             
=========================================
+ Hits        25831    29151   +3320     
+ Misses       9586     6266   -3320

carmocca

Neat

Borda

thought this was already enforced by black...

…mit docs)

for more information, see https://pre-commit.ci

tchaton

LGTM !

(cherry picked from commit 018a308)

Enable RUF018 rule for walrus assignments in asserts

76da0f1

awaelchli requested review from lantiga, Borda and tchaton as code owners October 28, 2023 14:07

github-actions bot added the package label Oct 28, 2023

awaelchli added the tests label Oct 28, 2023

awaelchli added the fun Staff contributions outside working hours - to differentiate from the "community" label label Oct 28, 2023

awaelchli added this to the 2.2 milestone Oct 28, 2023

awaelchli requested a review from carmocca October 28, 2023 14:08

[pre-commit.ci] auto fixes from pre-commit.com hooks

df738d6

for more information, see https://pre-commit.ci

pre-commit-ci bot requested review from ethanwharris, justusschock, nohalon and williamFalcon as code owners October 28, 2023 14:08

github-actions bot added fabric lightning.fabric.Fabric app (removed) Generic label for Lightning App package pl Generic label for PyTorch Lightning package labels Oct 28, 2023

carmocca approved these changes Oct 28, 2023

View reviewed changes

Borda approved these changes Oct 28, 2023

View reviewed changes

mergify bot added the ready PRs ready to be merged label Oct 28, 2023

awaelchli and others added 4 commits October 28, 2023 18:23

pre-commit

a789cf3

ruff should run before black when autofix is enabled (see ruff precom…

7d36617

…mit docs)

[pre-commit.ci] auto fixes from pre-commit.com hooks

49891ba

for more information, see https://pre-commit.ci

avoid black conflict

ea94a7f

tchaton approved these changes Oct 30, 2023

View reviewed changes

awaelchli added 3 commits October 30, 2023 22:10

Merge branch 'master' into tests/ruff-18

adf4b34

flaky

73e429c

flaky

2355fa4

awaelchli merged commit 018a308 into master Oct 31, 2023

awaelchli deleted the tests/ruff-18 branch October 31, 2023 01:16

Borda pushed a commit that referenced this pull request Nov 2, 2023

Enable RUF018 rule for walrus assignments in asserts (#18886)

ddeaf29

(cherry picked from commit 018a308)

Borda modified the milestones: 2.2, 2.1.x Nov 2, 2023

Borda pushed a commit that referenced this pull request Nov 2, 2023

Enable RUF018 rule for walrus assignments in asserts (#18886)

98a2f54

(cherry picked from commit 018a308)

lantiga pushed a commit that referenced this pull request Nov 6, 2023

Enable RUF018 rule for walrus assignments in asserts (#18886)

2c63468

(cherry picked from commit 018a308)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable RUF018 rule for walrus assignments in asserts #18886

Enable RUF018 rule for walrus assignments in asserts #18886

awaelchli commented Oct 28, 2023 •

edited by github-actions bot

Loading

github-actions bot commented Oct 28, 2023 •

edited

Loading

codecov bot commented Oct 28, 2023 •

edited

Loading

carmocca left a comment

Borda left a comment

tchaton left a comment

Enable RUF018 rule for walrus assignments in asserts #18886

Enable RUF018 rule for walrus assignments in asserts #18886

Conversation

awaelchli commented Oct 28, 2023 • edited by github-actions bot Loading

What does this PR do?

github-actions bot commented Oct 28, 2023 • edited Loading

⚡ Required checks status: All passing 🟢

Groups summary

codecov bot commented Oct 28, 2023 • edited Loading

Codecov Report

carmocca left a comment

Choose a reason for hiding this comment

Borda left a comment

Choose a reason for hiding this comment

tchaton left a comment

Choose a reason for hiding this comment

awaelchli commented Oct 28, 2023 •

edited by github-actions bot

Loading

github-actions bot commented Oct 28, 2023 •

edited

Loading

codecov bot commented Oct 28, 2023 •

edited

Loading