evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whole-string match reqs in comment_requirement (#55192)

Browse source 
Co-authored-by: Franck Nijhof <frenck@frenck.nl>
Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
This commit is contained in:
Ian 2021-08-30 10:20:02 -05:00 • committed by GitHub
parent cbc68e45cd
commit de5a22953d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
script/hassfest/requirements.py
View file

@ -15,7 +15,7 @@ from tqdm import tqdm
from homeassistant.const import REQUIRED_PYTHON_VER
import homeassistant.util.package as pkg_util
from script.gen_requirements_all import COMMENT_REQUIREMENTS
from script.gen_requirements_all import COMMENT_REQUIREMENTS, normalize_package_name
from .model import Config, Integration
@ -48,18 +48,6 @@ IGNORE_VIOLATIONS = {
}
def normalize_package_name(requirement: str) -> str:
"""Return a normalized package name from a requirement string."""
match = PACKAGE_REGEX.search(requirement)
if not match:
return ""
# pipdeptree needs lowercase and dash instead of underscore as separator
package = match.group(1).lower().replace("_", "-")
return package
def validate(integrations: dict[str, Integration], config: Config):
"""Handle requirements for integrations."""
# Check if we are doing format-only validation.
@ -134,7 +122,7 @@ def validate_requirements(integration: Integration):
f"Failed to normalize package name from requirement {req}",
)
return
if package in IGNORE_PACKAGES:
if (package == ign for ign in IGNORE_PACKAGES):
continue
integration_requirements.add(req)
integration_packages.add(package)