Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix device name customization on ZHA add devices page #25180

Merged
merged 4 commits into from
Jul 16, 2019

Conversation

dmulcahey
Copy link
Contributor

Description:

This PR cleans up the usage of the device registry during device adding and removal and addresses #25164

Related issue: fixes #25164

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. 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]

@dmulcahey dmulcahey added this to the 0.96.0 milestone Jul 16, 2019
@dmulcahey dmulcahey requested a review from Adminiuga July 16, 2019 11:46
@homeassistant homeassistant added cla-signed has-tests small-pr PRs with less than 30 lines. labels Jul 16, 2019
@ghost ghost assigned Adminiuga and dmulcahey Jul 16, 2019
@ghost
Copy link

ghost commented Jul 16, 2019

Hey there @Adminiuga, mind taking a look at this pull request as its been labeled with a integration (zha) you are listed as a codeowner for? Thanks!

This is a automatic comment generated by codeowners-mention to help ensure issues and pull requests are seen by the right people.

@dmulcahey dmulcahey changed the title Dm/zha force add device reg Fix device name customization on ZHA add devices page Jul 16, 2019
Copy link
Contributor

@Adminiuga Adminiuga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to merge.

@balloob balloob merged commit ac91423 into home-assistant:dev Jul 16, 2019
balloob pushed a commit that referenced this pull request Jul 17, 2019
* ensure new device exists

* clean up dev reg handling

* update test

* fix tests
@balloob balloob mentioned this pull request Jul 17, 2019
KJonline pushed a commit to Rendili/home-assistant that referenced this pull request Jul 17, 2019
…into hive_water_heater

* 'dev' of https://github.com/home-assistant/home-assistant: (49 commits)
  Pin Docker to Debain Stretch (home-assistant#25206)
  Updated frontend to 20190717.0
  Add HmIP-PCBS2, HmIP-PCBS-BAT to Homematic IP Cloud (home-assistant#25201)
  Simplify cache restore (home-assistant#25186)
  Only include target temp if has right support flag (home-assistant#25193)
  Fix issue home-assistant#24495 (home-assistant#25199)
  Handle somfy expired token (home-assistant#25195)
  Add login_method config option to fix login issue with RouterOS Version > 6.43 (home-assistant#25194)
  Add HMIP-FCI / HMIP-FBL / HmIP-BBL (home-assistant#25188)
  [climate] Tweak evohome migration (home-assistant#25187)
  Fix device name customization on ZHA add devices page (home-assistant#25180)
  Upgrade mypy to 0.720, turn on unreachability warnings (home-assistant#25157)
  Use MockConfigEntry (home-assistant#25190)
  Add severe weather sensor to Dark Sky (home-assistant#22701)
  Fix typo in azure-pipelines-ci.yml
  Raise not ready when no data from API is retrieved (home-assistant#25182)
  Improve Nuki lock (home-assistant#22888)
  Delete config.yml (home-assistant#25181)
  Upgrade luftdaten to 0.6.2 (home-assistant#25177)
  Upgrade Mastodon.py to 1.4.5 (home-assistant#25176)
  ...

# Conflicts:
#	homeassistant/components/hive/water_heater.py
@lock lock bot locked and limited conversation to collaborators Jul 17, 2019
@dmulcahey dmulcahey deleted the dm/zha-force-add-device-reg branch July 18, 2019 10:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Naming device in ZHA pairing screen fails
4 participants