Skip to content

Commit

Permalink
Merge pull request #65 from custom-components/develop
Browse files Browse the repository at this point in the history
Merge develop into master
  • Loading branch information
isabellaalstrom authored Aug 14, 2020
2 parents 8071ed2 + a657f8d commit adc1bcd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"*.yaml": "home-assistant"
}
}
2 changes: 1 addition & 1 deletion custom_components/grocy/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ async def _test_credentials(self, url, api_key, port, verify_ssl):
"""Return true if credentials is valid."""
try:
client = Grocy(url, api_key, port, verify_ssl)
client.stock()
await self.hass.async_add_executor_job(client.stock)
return True
except Exception as e: # pylint: disable=broad-except
_LOGGER.exception(e)
Expand Down
13 changes: 10 additions & 3 deletions custom_components/grocy/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
"documentation": "https://github.com/custom-components/grocy",
"dependencies": [],
"config_flow": true,
"codeowners": ["@SebRut", "@isabellaalstrom"],
"requirements": ["pygrocy==0.16.0", "iso8601==0.1.12", "integrationhelper"]
}
"codeowners": [
"@SebRut",
"@isabellaalstrom"
],
"requirements": [
"pygrocy==0.17.0",
"iso8601==0.1.12",
"integrationhelper"
]
}

0 comments on commit adc1bcd

Please sign in to comment.