Add ruff B005, B015, B032 and fix occurrences #113543

autinerd · 2024-03-15T19:13:59Z

Proposed change

This adds the following Ruff rules and fixes the occurrences in the codebase:

B005: Using .strip() with multi-character strings is misleading
B015: Pointless comparison. Did you mean to assign a value? Otherwise, prepend assert or remove it.
Quite some tests had comparisons without assert, which are pointless.
~~B027: {name} is an empty method in an abstract base class, but has no abstract decorator~~
B032: Possible unintentional type annotation (using :). Did you mean to assign (using =)?

Type of change

Dependency upgrade
Bugfix (non-breaking change which fixes an issue)
New integration (thank you!)
New feature (which adds functionality to an existing integration)
Deprecation (breaking change to happen in the future)
Breaking change (fix/feature causing existing functionality to break)
Code quality improvements to existing code or addition of tests

Additional information

This PR fixes or closes issue: fixes #
This PR is related to issue:
Link to documentation pull request:

Checklist

The code change is tested and works locally.
Local tests pass. Your PR cannot be merged unless tests pass
There is no commented out code in this PR.
I have followed the development checklist
I have followed the perfect PR recommendations
The code has been formatted using Ruff (ruff format homeassistant tests)
Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated for www.home-assistant.io

If the code communicates with devices, web services, or third-party tools:

The manifest file has all fields filled out correctly.
Updated and included derived files by running: python3 -m script.hassfest.
New or updated dependencies have been added to requirements_all.txt.
Updated by running python3 -m script.gen_requirements_all.
For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

I have reviewed two other open pull requests in this repository.

jbouwh

LGTM,
Thnx @autinerd 👍

mypy issue

autinerd · 2024-03-15T19:40:12Z

homeassistant/components/conversation/agent.py

+    @abstractmethod
    async def async_reload(self, language: str | None = None) -> None:
        """Clear cached intents for a language."""

+    @abstractmethod
    async def async_prepare(self, language: str | None = None) -> None:
        """Load intents for a language."""


Okay, these two functions are only implemented by DefaultAgent, but no other of the Agent classes. I will revert this rule for now because fixing this would need more work.

autinerd · 2024-03-15T20:25:32Z

Oh, quite some tests are failing because of the "new" asserts. Will have to look into them.

jbouwh · 2024-03-15T20:35:13Z

I'll have a look at the mqtt siren test issues

tests/components/zha/test_websocket_api.py

Co-authored-by: Jan Bouwhuis <jbouwh@users.noreply.github.com>

jbouwh · 2024-03-15T21:06:26Z

You need to fix the merge conflict

tests/helpers/test_aiohttp_client.py

Co-authored-by: Jan Bouwhuis <jbouwh@users.noreply.github.com>

autinerd · 2024-03-15T23:21:51Z

Hmm, I don't know why this test fails, on my machine the hassio tests pass.

jbouwh · 2024-03-15T23:23:21Z

Hmm, I don't know why this test fails, on my machine the hassio tests pass.

I had the same. I'll have a closer look.

bdraco · 2024-03-15T23:24:48Z

I expect the 0.1 in with patch("homeassistant.components.hassio.issues.REQUEST_REFRESH_DELAY", new=0.1): isn't long enough if the system is otherwise slow

Maybe try 0.2

jbouwh · 2024-03-16T00:28:26Z

I expect the 0.1 in with patch("homeassistant.components.hassio.issues.REQUEST_REFRESH_DELAY", new=0.1): isn't long enough if the system is otherwise slow

Maybe try 0.2

#113569

bdraco · 2024-03-16T01:10:44Z

I expect the 0.1 in with patch("homeassistant.components.hassio.issues.REQUEST_REFRESH_DELAY", new=0.1): isn't long enough if the system is otherwise slow
Maybe try 0.2

#113569

Yeah thats a much better fix 👍

jbouwh

LGTM,
Thnx @autinerd 👍

Add ruff B005, B015, B027, B032 and fix occurrences

85491b2

home-assistant bot added cla-signed code-quality core has-tests small-pr PRs with less than 30 lines. labels Mar 15, 2024

revert unwanted changes in pyproject.toml

3b8878e

autinerd marked this pull request as ready for review March 15, 2024 19:15

autinerd requested review from dmulcahey, Adminiuga, puddly, TheJulianJES, joostlek, a team, emontnemery, jbouwh, bdraco, allenporter, farmio, balloob, OttoWinter, jesserockz, synesthesiam and ochlocracy as code owners March 15, 2024 19:15

jbouwh previously approved these changes Mar 15, 2024

View reviewed changes

autinerd commented Mar 15, 2024

View reviewed changes

revert B027

f3f2666

autinerd changed the title ~~Add ruff B005, B015, B027, B032 and fix occurrences~~ Add ruff B005, B015, B032 and fix occurrences Mar 15, 2024

autinerd marked this pull request as draft March 15, 2024 20:33

This was referenced Mar 15, 2024

fix homekit test asserts #113549

Merged

fix mqtt siren test asserts #113550

Merged

jbouwh reviewed Mar 15, 2024

View reviewed changes

tests/components/zha/test_websocket_api.py Outdated Show resolved Hide resolved

Fix zha websocket API test

48a7aed

Co-authored-by: Jan Bouwhuis <jbouwh@users.noreply.github.com>

Merge branch 'dev' into ruff-b005

1447934

autinerd mentioned this pull request Mar 15, 2024

fix aiohttp_client helper test asserts #113551

Closed

20 tasks

jbouwh reviewed Mar 15, 2024

View reviewed changes

tests/helpers/test_aiohttp_client.py Outdated Show resolved Hide resolved

Update tests/helpers/test_aiohttp_client.py

397ece9

Co-authored-by: Jan Bouwhuis <jbouwh@users.noreply.github.com>

autinerd marked this pull request as ready for review March 15, 2024 21:56

fix formatting

047c74b

Merge branch 'dev' into ruff-b005

4dd260f

bdraco approved these changes Mar 16, 2024

View reviewed changes

bdraco added the smash Indicator this PR is close to finish for merging or closing label Mar 16, 2024

jbouwh approved these changes Mar 16, 2024

View reviewed changes

bdraco merged commit 27e844e into home-assistant:dev Mar 16, 2024
35 checks passed

bdraco removed the smash Indicator this PR is close to finish for merging or closing label Mar 16, 2024

autinerd deleted the ruff-b005 branch March 16, 2024 07:10

github-actions bot locked and limited conversation to collaborators Mar 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ruff B005, B015, B032 and fix occurrences #113543

Add ruff B005, B015, B032 and fix occurrences #113543

autinerd commented Mar 15, 2024 •

edited

Loading

jbouwh left a comment

autinerd Mar 15, 2024

autinerd commented Mar 15, 2024

jbouwh commented Mar 15, 2024

jbouwh commented Mar 15, 2024

autinerd commented Mar 15, 2024

jbouwh commented Mar 15, 2024

bdraco commented Mar 15, 2024

jbouwh commented Mar 16, 2024

bdraco commented Mar 16, 2024

jbouwh left a comment

Add ruff B005, B015, B032 and fix occurrences #113543

Add ruff B005, B015, B032 and fix occurrences #113543

Conversation

autinerd commented Mar 15, 2024 • edited Loading

Proposed change

Type of change

Additional information

Checklist

jbouwh left a comment

Choose a reason for hiding this comment

autinerd Mar 15, 2024

Choose a reason for hiding this comment

autinerd commented Mar 15, 2024

jbouwh commented Mar 15, 2024

jbouwh commented Mar 15, 2024

autinerd commented Mar 15, 2024

jbouwh commented Mar 15, 2024

bdraco commented Mar 15, 2024

jbouwh commented Mar 16, 2024

bdraco commented Mar 16, 2024

jbouwh left a comment

Choose a reason for hiding this comment

autinerd commented Mar 15, 2024 •

edited

Loading