Check if a script requirement is available before install #20517
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
balloob
reviewed
Jan 29, 2019
homeassistant/scripts/__init__.py
Outdated
| @@ -48,6 +50,14 @@ def run(args: List) -> int: | |||
| logging.basicConfig(stream=sys.stdout, level=logging.INFO) | |||
|
|
|||
| for req in getattr(script, 'REQUIREMENTS', []): | |||
| try: | |||
| # Only use the requirement's project_name to verify it exists | |||
| project_name = Requirement.parse(req).project_name | |||
There was a problem hiding this comment.
Let's not reinvent the wheel. Import PackageLoadable from homeassistant.requirements
houndci-bot
reviewed
Feb 24, 2019
balloob
reviewed
Feb 25, 2019
| @@ -22,8 +22,6 @@ | |||
| from homeassistant.exceptions import HomeAssistantError | |||
|
|
|||
| REQUIREMENTS = ('colorlog==4.0.2',) | |||
| if system() == 'Windows': # Ensure colorama installed for colorlog on Windows | |||
There was a problem hiding this comment.
It’s automatic these days. In the past you needed colorlog[windows]
See https://pypi.org/project/colorlog/ search windows/colorama
balloob
approved these changes
Feb 25, 2019
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Retry of #20272
Current behaviour always installs a script's requirement
This checks if a requirement's project name is available (by import) before it forces installThere is full (including version) requirement handling available inrequirements.py, but this requires a full hass instance and seems like an overkill for scriptsRelated issue (if applicable): fixes #18651
Checklist:
tox. Your PR cannot be merged unless tests pass