Add support for Stretch product to Plugwise integration by CoMPaTech · Pull Request #40108 · home-assistant/core

CoMPaTech · 2020-09-15T18:13:32Z

Proposed change

Add support for Plugwise Stretch for switching devices (i.e. this makes using older circle/stealth plugs possible). Within restructuring for these plugs we also can close #38238. As per request link to our Changelog for the version bump for the final modifications for Stretch support. Additionally some minor corrections (sorting CONSTs and better usage of CONSTs) and additional fixtures for the stretch platform (and config_flow accordingly).

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)
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 no % icon for Plugwise auxiliary modulation level #38238 Plugwise P1 Smile reporting same energy consumption for peak and off_peak, not reporting production (interval) #42725
This PR is related to issue: Plugwise integration: no modulation level for central heating #42684
Link to documentation pull request: Plugwise Stretch changes for #40108 home-assistant.io#14508

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][dev-checklist]
The code has been formatted using Black (black --fast 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][docs-repository]

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

The [manifest file][manifest-docs] 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.
Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

I have reviewed one other [open pull requests][prs] in this repository in the past week. (PR 39963)

probot-home-assistant · 2020-09-15T18:13:42Z

Hey there @bouwew, mind taking a look at this pull request as its been labeled with an integration (plugwise) you are listed as a codeowner for? Thanks!
_{^{(message by CodeOwnersMention)}}

CoMPaTech · 2020-09-27T13:35:49Z

Catch-up with dev wrt #40543

bouwew

Looking good!

homeassistant/components/plugwise/sensor.py

CoMPaTech · 2020-10-08T07:52:08Z

Catchup with dev (mostly with ourselves from #41201) complete.

Bre77

Looks good to me.

CoMPaTech · 2020-10-16T19:45:35Z

Catched up with dev, should be fine for final review and eventual merge!

CoMPaTech · 2020-11-01T14:48:25Z

Catchup with dev - still waiting eagerly for review. (Our backlog of changes is building waiting for these PRs to be merged, among them the requested integration closing #35713).

CoMPaTech · 2020-11-01T20:31:54Z

Also fixes #42684

CoMPaTech · 2020-11-07T10:03:02Z

Also fixes #42725

homeassistant/components/plugwise/strings.json

homeassistant/components/plugwise/binary_sensor.py

homeassistant/components/plugwise/gateway.py

homeassistant/components/plugwise/switch.py

CoMPaTech · 2020-11-08T13:20:10Z

Hi @ctalkington - I think we addressed the requested changes, could you recheck?

ctalkington · 2020-11-08T16:56:53Z

homeassistant/components/plugwise/gateway.py

+        username=entry.data.get(CONF_USERNAME, DEFAULT_USERNAME),
        password=entry.data[CONF_PASSWORD],
        port=entry.data.get(CONF_PORT, DEFAULT_PORT),
        timeout=30,


should the default timeout be used here as well? can be done in new PR if so.

We'll have a look at this, thanks!

ctalkington

im going to approve here. you may see some additional followup requests as other devs become available to review. please try to keep future PRs concise and focused as the review queue does have a backlog and not everyone has availability for the medium to large reviews. You will have a better developer experience if the small bugfixes are done separately in the future.

CoMPaTech · 2020-11-08T18:07:20Z

Duly noted @ctalkington - we try to keep 'm as small and keep up with our own backlog (which, due to the merger for USB has increased). Thanks for your time!

@bouwew

* Notifications extract from beta * Remove info loggings * Delete notification service * Only notifications for right smiles * Revert to correct logic * Catchup with dev (mostly with ourselves from #41201) * Remove debug logging * Naming improvement * Improve test quality as per codecov patch requirement * Revert to original condition (and appropriately test) * Fix delete_notification_service, bring tests fixtures up to 1.6.0 including notifications * Review comment (@bouwew) * Correct test value * Re-apply #40108 fix after rebase sidestep * Update tests/components/plugwise/test_init.py Co-authored-by: Chris Talkington <chris@talkingtontech.com> * Add needed state to imports * Remove separate gw unload code * Change entry_fail approach * Revert persistent notification part * Revert persistent notification part - lint * Update homeassistant/components/plugwise/binary_sensor.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> * Update homeassistant/components/plugwise/binary_sensor.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> * Rework reuse of sensor in binary_sensor * Explicit state attribute keys * Remove tempfile * List of notifications per severity * Update homeassistant/components/plugwise/binary_sensor.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> Co-authored-by: Chris Talkington <chris@talkingtontech.com> Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

@bouwew

…t#41473) * Notifications extract from beta * Remove info loggings * Delete notification service * Only notifications for right smiles * Revert to correct logic * Catchup with dev (mostly with ourselves from home-assistant#41201) * Remove debug logging * Naming improvement * Improve test quality as per codecov patch requirement * Revert to original condition (and appropriately test) * Fix delete_notification_service, bring tests fixtures up to 1.6.0 including notifications * Review comment (@bouwew) * Correct test value * Re-apply home-assistant#40108 fix after rebase sidestep * Update tests/components/plugwise/test_init.py Co-authored-by: Chris Talkington <chris@talkingtontech.com> * Add needed state to imports * Remove separate gw unload code * Change entry_fail approach * Revert persistent notification part * Revert persistent notification part - lint * Update homeassistant/components/plugwise/binary_sensor.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> * Update homeassistant/components/plugwise/binary_sensor.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> * Rework reuse of sensor in binary_sensor * Explicit state attribute keys * Remove tempfile * List of notifications per severity * Update homeassistant/components/plugwise/binary_sensor.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> Co-authored-by: Chris Talkington <chris@talkingtontech.com> Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

probot-home-assistant bot added has-tests integration: plugwise new-feature labels Sep 15, 2020

homeassistant added the cla-signed label Sep 15, 2020

probot-home-assistant bot added the by-code-owner label Sep 15, 2020

CoMPaTech mentioned this pull request Sep 15, 2020

Plugwise Stretch changes for #40108 home-assistant/home-assistant.io#14508

Merged

8 tasks

CoMPaTech force-pushed the plugwise-stretch branch from bd6da41 to 41637cd Compare September 19, 2020 14:47

CoMPaTech force-pushed the plugwise-stretch branch from 41637cd to 90e0827 Compare September 27, 2020 12:35

bouwew approved these changes Sep 27, 2020

View reviewed changes

CoMPaTech force-pushed the plugwise-stretch branch 2 times, most recently from 86f2aac to 81d8909 Compare October 8, 2020 06:34

bouwew reviewed Oct 8, 2020

View reviewed changes

homeassistant/components/plugwise/sensor.py Outdated Show resolved Hide resolved

Bre77 approved these changes Oct 14, 2020

View reviewed changes

CoMPaTech force-pushed the plugwise-stretch branch from e2f976c to e877a30 Compare October 16, 2020 18:14

CoMPaTech added 12 commits November 1, 2020 15:24

Initial switch-group/stretch with failing wk_lisa_battery test

65e8c06

Adding switch tests, but TypeErrors, needs more investigation

17fe125

Fixes and tests aligned

f4c638e

Review updates

91bce62

Use const

925722c

Comments

1569943

Add stretch hostname for testing part

bf8fcaa

Remove unused consts

383472b

Revert guardings in line with -beta

dda777b

Catchup with dev (mostly with ourselves from home-assistant#41201)

6c16da1

Update docstring

217eb2f

Remove debug logging

31c588f

CoMPaTech force-pushed the plugwise-stretch branch from e877a30 to 31c588f Compare November 1, 2020 14:25

bouwew mentioned this pull request Nov 1, 2020

Plugwise integration: no modulation level for central heating #42684

Closed

bouwew mentioned this pull request Nov 2, 2020

Plugwise P1 Smile reporting same energy consumption for peak and off_peak, not reporting production (interval) #42725

Closed

CoMPaTech added 2 commits November 2, 2020 14:46

Fix for home-assistant#42725 (incorrect entity namingi)

d7f12b0

Fix naming for gas interval

428f039

ctalkington reviewed Nov 8, 2020

View reviewed changes

homeassistant/components/plugwise/strings.json Show resolved Hide resolved

ctalkington requested changes Nov 8, 2020

View reviewed changes

homeassistant/components/plugwise/binary_sensor.py Outdated Show resolved Hide resolved

homeassistant/components/plugwise/gateway.py Show resolved Hide resolved

homeassistant/components/plugwise/switch.py Show resolved Hide resolved

bouwew and others added 4 commits November 8, 2020 11:05

Add missing CONF_USERNAME and use of it

d935577

Change "dummy" to "class"

2f5e6df

Don't use "class"

985de32

Fix CONF_USERNAME default, dummy and other consts

028b489

CoMPaTech requested a review from ctalkington November 8, 2020 13:20

ctalkington reviewed Nov 8, 2020

View reviewed changes

ctalkington approved these changes Nov 8, 2020

View reviewed changes

ctalkington merged commit 877bfcb into home-assistant:dev Nov 8, 2020

CoMPaTech added a commit to plugwise/home-assistant.core that referenced this pull request Nov 8, 2020

Re-apply home-assistant#40108 fix after rebase sidestep

0609c96

CoMPaTech deleted the plugwise-stretch branch March 13, 2022 18:59

Uh oh!

Conversation

CoMPaTech commented Sep 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed change

Type of change

Additional information

Checklist

Uh oh!

probot-home-assistant bot commented Sep 15, 2020

Uh oh!

CoMPaTech commented Sep 27, 2020

Uh oh!

bouwew left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CoMPaTech commented Oct 8, 2020

Uh oh!

Bre77 left a comment

Choose a reason for hiding this comment

Uh oh!

CoMPaTech commented Oct 16, 2020

Uh oh!

CoMPaTech commented Nov 1, 2020

Uh oh!

CoMPaTech commented Nov 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CoMPaTech commented Nov 7, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CoMPaTech commented Nov 8, 2020

Uh oh!

ctalkington Nov 8, 2020

Choose a reason for hiding this comment

Uh oh!

bouwew Nov 8, 2020

Choose a reason for hiding this comment

Uh oh!

ctalkington left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CoMPaTech commented Nov 8, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

CoMPaTech commented Sep 15, 2020 •

edited

Loading

CoMPaTech commented Nov 1, 2020 •

edited

Loading

ctalkington left a comment •

edited

Loading