[`pylint`] - use sets when possible for `PLR1714` autofix (`repeated-equality-comparison`) by diceroll123 · Pull Request #14372 · astral-sh/ruff

diceroll123 · 2024-11-15T23:48:57Z

Summary

Uses a set if we can determine that it should be used.

Test Plan

cargo test

github-actions · 2024-11-16T00:13:23Z

`ruff-ecosystem` results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

ℹ️ ecosystem check detected linter changes. (+31 -31 violations, +0 -0 fixes in 5 projects; 49 projects unchanged)

apache/airflow (+20 -20 violations, +0 -0 fixes)

ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview --select ALL

- airflow/assets/__init__.py:128:8: PLR1714 Consider merging multiple comparisons: `value in ("self", "context")`. Use a `set` if the elements are hashable.
+ airflow/assets/__init__.py:128:8: PLR1714 Consider merging multiple comparisons: `value in {"self", "context"}`.
- airflow/www/decorators.py:55:27: PLR1714 Consider merging multiple comparisons: `k in ("val", "value")`. Use a `set` if the elements are hashable.
+ airflow/www/decorators.py:55:27: PLR1714 Consider merging multiple comparisons: `k in {"val", "value"}`.
- airflow/www/views.py:4340:21: PLR1714 Consider merging multiple comparisons: `parsed_url.scheme in ("http", "https")`. Use a `set` if the elements are hashable.
+ airflow/www/views.py:4340:21: PLR1714 Consider merging multiple comparisons: `parsed_url.scheme in {"http", "https"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2956:8: PLR1714 Consider merging multiple comparisons: `package_format in ("sdist", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2956:8: PLR1714 Consider merging multiple comparisons: `package_format in {"sdist", "both"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2958:8: PLR1714 Consider merging multiple comparisons: `package_format in ("wheel", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2958:8: PLR1714 Consider merging multiple comparisons: `package_format in {"wheel", "both"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2974:8: PLR1714 Consider merging multiple comparisons: `package_format in ("sdist", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2974:8: PLR1714 Consider merging multiple comparisons: `package_format in {"sdist", "both"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2976:8: PLR1714 Consider merging multiple comparisons: `package_format in ("wheel", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:2976:8: PLR1714 Consider merging multiple comparisons: `package_format in {"wheel", "both"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:588:12: PLR1714 Consider merging multiple comparisons: `package_format in ("sdist", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:588:12: PLR1714 Consider merging multiple comparisons: `package_format in {"sdist", "both"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:590:12: PLR1714 Consider merging multiple comparisons: `package_format in ("wheel", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:590:12: PLR1714 Consider merging multiple comparisons: `package_format in {"wheel", "both"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:604:12: PLR1714 Consider merging multiple comparisons: `package_format in ("sdist", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:604:12: PLR1714 Consider merging multiple comparisons: `package_format in {"sdist", "both"}`.
- dev/breeze/src/airflow_breeze/commands/release_management_commands.py:606:12: PLR1714 Consider merging multiple comparisons: `package_format in ("wheel", "both")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/commands/release_management_commands.py:606:12: PLR1714 Consider merging multiple comparisons: `package_format in {"wheel", "both"}`.
- dev/breeze/src/airflow_breeze/utils/host_info_utils.py:39:8: PLR1714 Consider merging multiple comparisons: `os in ("linux", "darwin")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/utils/host_info_utils.py:39:8: PLR1714 Consider merging multiple comparisons: `os in {"linux", "darwin"}`.
- dev/breeze/src/airflow_breeze/utils/host_info_utils.py:49:8: PLR1714 Consider merging multiple comparisons: `os in ("linux", "darwin")`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/utils/host_info_utils.py:49:8: PLR1714 Consider merging multiple comparisons: `os in {"linux", "darwin"}`.
- dev/breeze/src/airflow_breeze/utils/packages.py:691:12: PLR1714 Consider merging multiple comparisons: `ex.returncode in (128, 2)`. Use a `set` if the elements are hashable.
+ dev/breeze/src/airflow_breeze/utils/packages.py:691:12: PLR1714 Consider merging multiple comparisons: `ex.returncode in {128, 2}`.
- helm_tests/airflow_aux/test_basic_helm_chart.py:81:12: PLR1714 Consider merging multiple comparisons: `version in ("2.3.2", "default")`. Use a `set` if the elements are hashable.
+ helm_tests/airflow_aux/test_basic_helm_chart.py:81:12: PLR1714 Consider merging multiple comparisons: `version in {"2.3.2", "default"}`.
- providers/src/airflow/providers/fab/auth_manager/security_manager/override.py:2258:12: PLR1714 Consider merging multiple comparisons: `provider in ("github", "githublocal")`. Use a `set` if the elements are hashable.
+ providers/src/airflow/providers/fab/auth_manager/security_manager/override.py:2258:12: PLR1714 Consider merging multiple comparisons: `provider in {"github", "githublocal"}`.
... 8 additional changes omitted for project

apache/superset (+4 -4 violations, +0 -0 fixes)

ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview --select ALL

- superset/migrations/versions/2023-03-17_13-24_b5ea9d343307_bar_chart_stack_options.py:82:16: PLR1714 Consider merging multiple comparisons: `stack in ("Stack", "Stream")`. Use a `set` if the elements are hashable.
+ superset/migrations/versions/2023-03-17_13-24_b5ea9d343307_bar_chart_stack_options.py:82:16: PLR1714 Consider merging multiple comparisons: `stack in {"Stack", "Stream"}`.
- superset/migrations/versions/2024-05-10_18-02_f84fde59123a_update_charts_with_old_time_comparison.py:198:13: PLR1714 Consider merging multiple comparisons: `Slice.viz_type in ("pop_kpi", "table")`. Use a `set` if the elements are hashable.
+ superset/migrations/versions/2024-05-10_18-02_f84fde59123a_update_charts_with_old_time_comparison.py:198:13: PLR1714 Consider merging multiple comparisons: `Slice.viz_type in {"pop_kpi", "table"}`.
- superset/utils/core.py:312:13: PLR1714 Consider merging multiple comparisons: `standalone_param not in ("false", "0")`. Use a `set` if the elements are hashable.
+ superset/utils/core.py:312:13: PLR1714 Consider merging multiple comparisons: `standalone_param not in {"false", "0"}`.
- tests/integration_tests/databases/commands_tests.py:1184:12: PLR1714 Consider merging multiple comparisons: `database.backend in ("postgresql", "mysql")`. Use a `set` if the elements are hashable.
+ tests/integration_tests/databases/commands_tests.py:1184:12: PLR1714 Consider merging multiple comparisons: `database.backend in {"postgresql", "mysql"}`.

aws/aws-sam-cli (+1 -1 violations, +0 -0 fixes)

ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview

- tests/integration/publish/publish_app_integ_base.py:60:16: PLR1714 Consider merging multiple comparisons: `f.suffix in (".yaml", ".json")`. Use a `set` if the elements are hashable.
+ tests/integration/publish/publish_app_integ_base.py:60:16: PLR1714 Consider merging multiple comparisons: `f.suffix in {".yaml", ".json"}`.

bokeh/bokeh (+4 -4 violations, +0 -0 fixes)

ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview --select ALL

- src/bokeh/core/has_props.py:280:24: PLR1714 Consider merging multiple comparisons: `head in ("bokeh", "__main__")`. Use a `set` if the elements are hashable.
+ src/bokeh/core/has_props.py:280:24: PLR1714 Consider merging multiple comparisons: `head in {"bokeh", "__main__"}`.
- src/bokeh/server/tornado.py:622:12: PLR1714 Consider merging multiple comparisons: `mode in ("server", "server-dev")`. Use a `set` if the elements are hashable.
+ src/bokeh/server/tornado.py:622:12: PLR1714 Consider merging multiple comparisons: `mode in {"server", "server-dev"}`.
- tests/unit/bokeh/embed/test_server__embed.py:215:16: PLR1714 Consider merging multiple comparisons: `r in ("&foo=10&bar=baz", "&bar=baz&foo=10")`. Use a `set` if the elements are hashable.
+ tests/unit/bokeh/embed/test_server__embed.py:215:16: PLR1714 Consider merging multiple comparisons: `r in {"&foo=10&bar=baz", "&bar=baz&foo=10"}`.
- tests/unit/bokeh/embed/test_server__embed.py:222:16: PLR1714 Consider merging multiple comparisons: `r in ("&foo=10&bar=baz", "&bar=baz&foo=10")`. Use a `set` if the elements are hashable.
+ tests/unit/bokeh/embed/test_server__embed.py:222:16: PLR1714 Consider merging multiple comparisons: `r in {"&foo=10&bar=baz", "&bar=baz&foo=10"}`.

latchbio/latch (+2 -2 violations, +0 -0 fixes)

ruff check --no-cache --exit-zero --ignore RUF9 --output-format concise --preview

- src/latch_cli/services/stop_pod.py:22:8: PLR1714 Consider merging multiple comparisons: `res.status_code in (403, 404)`. Use a `set` if the elements are hashable.
+ src/latch_cli/services/stop_pod.py:22:8: PLR1714 Consider merging multiple comparisons: `res.status_code in {403, 404}`.
- src/latch_cli/snakemake/single_task_snakemake.py:362:8: PLR1714 Consider merging multiple comparisons: `parsed.scheme not in ("", "docker")`. Use a `set` if the elements are hashable.
+ src/latch_cli/snakemake/single_task_snakemake.py:362:8: PLR1714 Consider merging multiple comparisons: `parsed.scheme not in {"", "docker"}`.

Changes by rule (1 rules affected)

code	total	+ violation	- violation	+ fix	- fix
PLR1714	62	31	31	0	0

MichaReiser · 2024-11-16T16:54:33Z

Could we make this a preview only change? And could you update the test plan if you already went through the ecosystem changes?

diceroll123 · 2024-11-16T18:58:00Z

Could we make this a preview only change? And could you update the test plan if you already went through the ecosystem changes?

Preview check added!

As for the ecosystem changes, seems fine with what's there, I'm all ears if not!

…when all elements are hashable (`PLR1714`) (#16685) ## Summary This PR promotes the fix improvements for `PLR1714` that were introduced in #14372 to stable. The improvement is that the fix now proposes to use a set if all elements are hashable: ``` foo == "bar" or foo == "baz" or foo == "qux" ``` Gets fixed to ```py foo in {"bar", "baz", "qux"} ``` where it previously always got fixed to a tuple. The new fix was first released in ruff 0.8.0 (Nov last year). This is not a breaking change. The change was preview gated only to get some extra test coverage. There are no open issues or PRs related to this changed fix behavior.

diceroll123 force-pushed the use-set-for-PLR1714 branch from 7809a3c to d22ffd5 Compare November 15, 2024 23:58

[pylint] - use sets when possible for PLR1714 autofix

4b47271

diceroll123 force-pushed the use-set-for-PLR1714 branch from d22ffd5 to 4b47271 Compare November 16, 2024 00:26

Only suggest to use a set if we can't tell if they're hashable

ea1f7c6

diceroll123 added 2 commits November 16, 2024 12:55

make new changes preview

e7e9f20

wait...we don't care if the hashed values are the same value

ad21f4a

MichaReiser added rule Implementing or modifying a lint rule fixes Related to suggested fixes for violations preview Related to preview mode features and removed rule Implementing or modifying a lint rule labels Nov 18, 2024

MichaReiser merged commit 5776535 into astral-sh:main Nov 18, 2024

BrewTestBot mentioned this pull request Nov 22, 2024

ruff 0.8.0 Homebrew/homebrew-core#198630

Merged

MichaReiser mentioned this pull request Mar 12, 2025

[pylint] Improve repeated-equality-comparison fix to use a set when all elements are hashable (PLR1714) #16685

Merged

yunchipang mentioned this pull request Jun 6, 2025

[pylint] add fix safety section (PLR1714) #18415

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

[`pylint`] - use sets when possible for `PLR1714` autofix (`repeated-equality-comparison`)#14372

[`pylint`] - use sets when possible for `PLR1714` autofix (`repeated-equality-comparison`)#14372
MichaReiser merged 4 commits intoastral-sh:mainfrom
diceroll123:use-set-for-PLR1714

diceroll123 commented Nov 15, 2024 •

edited

Loading

Uh oh!

github-actions bot commented Nov 16, 2024 •

edited

Loading

Uh oh!

MichaReiser commented Nov 16, 2024

Uh oh!

diceroll123 commented Nov 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Comments

Conversation

diceroll123 commented Nov 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test Plan

Uh oh!

github-actions bot commented Nov 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ruff-ecosystem results

Linter (stable)

Linter (preview)

Uh oh!

MichaReiser commented Nov 16, 2024

Uh oh!

diceroll123 commented Nov 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

diceroll123 commented Nov 15, 2024 •

edited

Loading

github-actions bot commented Nov 16, 2024 •

edited

Loading

`ruff-ecosystem` results