Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump regenmaschine to 2.1.0 (#38649)

pull/38650/head
Aaron Bach 2020-08-07 18:01:55 -06:00 committed by GitHub
parent 353817337e
commit 4cceb4ad0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/rainmachine/__init__.py
View File

@ -133,7 +133,7 @@ async def async_setup_entry(hass, config_entry):
_verify_domain_control = verify_domain_control(hass, DOMAIN) _verify_domain_control = verify_domain_control(hass, DOMAIN)
websession = aiohttp_client.async_get_clientsession(hass) websession = aiohttp_client.async_get_clientsession(hass)
client = Client(websession) client = Client(session=websession)
try: try:
await client.load_local( await client.load_local(

6
homeassistant/components/rainmachine/config_flow.py
View File

@ -1,5 +1,5 @@
"""Config flow to configure the RainMachine component.""" """Config flow to configure the RainMachine component."""
from regenmaschine import login from regenmaschine import Client
from regenmaschine.errors import RainMachineError from regenmaschine.errors import RainMachineError
import voluptuous as vol import voluptuous as vol
@ -59,12 +59,12 @@ class RainMachineFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
self._abort_if_unique_id_configured() self._abort_if_unique_id_configured()
websession = aiohttp_client.async_get_clientsession(self.hass) websession = aiohttp_client.async_get_clientsession(self.hass)
client = Client(session=websession)
try: try:
await login( await client.load_local(
user_input[CONF_IP_ADDRESS], user_input[CONF_IP_ADDRESS],
user_input[CONF_PASSWORD], user_input[CONF_PASSWORD],
websession,
port=user_input[CONF_PORT], port=user_input[CONF_PORT],
ssl=user_input.get(CONF_SSL, True), ssl=user_input.get(CONF_SSL, True),
) )

2
homeassistant/components/rainmachine/manifest.json
View File

@ -3,6 +3,6 @@
"name": "RainMachine", "name": "RainMachine",
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/rainmachine", "documentation": "https://www.home-assistant.io/integrations/rainmachine",
"requirements": ["regenmaschine==1.5.1"], "requirements": ["regenmaschine==2.1.0"],
"codeowners": ["@bachya"] "codeowners": ["@bachya"]
} }

2
requirements_all.txt
View File

@ -1876,7 +1876,7 @@ raspyrfm-client==1.2.8
recollect-waste==1.0.1 recollect-waste==1.0.1
# homeassistant.components.rainmachine # homeassistant.components.rainmachine
regenmaschine==1.5.1 regenmaschine==2.1.0
# homeassistant.components.python_script # homeassistant.components.python_script
restrictedpython==5.0 restrictedpython==5.0

2
requirements_test_all.txt
View File

@ -842,7 +842,7 @@ pyzerproc==0.2.5
rachiopy==0.1.3 rachiopy==0.1.3
# homeassistant.components.rainmachine # homeassistant.components.rainmachine
regenmaschine==1.5.1 regenmaschine==2.1.0
# homeassistant.components.python_script # homeassistant.components.python_script
restrictedpython==5.0 restrictedpython==5.0

7
tests/components/rainmachine/test_config_flow.py
View File

@ -50,8 +50,7 @@ async def test_invalid_password(hass):
flow.context = {"source": SOURCE_USER} flow.context = {"source": SOURCE_USER}
with patch( with patch(
"homeassistant.components.rainmachine.config_flow.login", "regenmaschine.client.Client.load_local", side_effect=RainMachineError,
side_effect=RainMachineError,
): ):
result = await flow.async_step_user(user_input=conf) result = await flow.async_step_user(user_input=conf)
assert result["errors"] == {CONF_PASSWORD: "invalid_credentials"} assert result["errors"] == {CONF_PASSWORD: "invalid_credentials"}
@ -84,7 +83,7 @@ async def test_step_import(hass):
flow.context = {"source": SOURCE_USER} flow.context = {"source": SOURCE_USER}
with patch( with patch(
"homeassistant.components.rainmachine.config_flow.login", return_value=True, "regenmaschine.client.Client.load_local", return_value=True,
): ):
result = await flow.async_step_import(import_config=conf) result = await flow.async_step_import(import_config=conf)
@ -115,7 +114,7 @@ async def test_step_user(hass):
flow.context = {"source": SOURCE_USER} flow.context = {"source": SOURCE_USER}
with patch( with patch(
"homeassistant.components.rainmachine.config_flow.login", return_value=True, "regenmaschine.client.Client.load_local", return_value=True,
): ):
result = await flow.async_step_user(user_input=conf) result = await flow.async_step_user(user_input=conf)