mirror of
https://github.com/home-assistant/core.git
synced 2025-12-24 12:59:34 +00:00
Use literal string interpolation in core (f-strings) (#26166)
This commit is contained in:
committed by
Paulus Schoutsen
parent
1efa29d6ff
commit
decf13b948
@@ -230,9 +230,7 @@ def gather_recursive_requirements(domain, seen=None):
|
||||
seen = set()
|
||||
|
||||
seen.add(domain)
|
||||
integration = Integration(
|
||||
pathlib.Path("homeassistant/components/{}".format(domain))
|
||||
)
|
||||
integration = Integration(pathlib.Path(f"homeassistant/components/{domain}"))
|
||||
integration.load_manifest()
|
||||
reqs = set(integration.manifest["requirements"])
|
||||
for dep_domain in integration.manifest["dependencies"]:
|
||||
@@ -272,13 +270,13 @@ def gather_requirements_from_manifests(errors, reqs):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest:
|
||||
errors.append("The manifest for integration {} is invalid.".format(domain))
|
||||
errors.append(f"The manifest for integration {domain} is invalid.")
|
||||
continue
|
||||
|
||||
process_requirements(
|
||||
errors,
|
||||
integration.manifest["requirements"],
|
||||
"homeassistant.components.{}".format(domain),
|
||||
f"homeassistant.components.{domain}",
|
||||
reqs,
|
||||
)
|
||||
|
||||
@@ -306,13 +304,9 @@ def process_requirements(errors, module_requirements, package, reqs):
|
||||
if req in IGNORE_REQ:
|
||||
continue
|
||||
if "://" in req:
|
||||
errors.append(
|
||||
"{}[Only pypi dependencies are allowed: {}]".format(package, req)
|
||||
)
|
||||
errors.append(f"{package}[Only pypi dependencies are allowed: {req}]")
|
||||
if req.partition("==")[1] == "" and req not in IGNORE_PIN:
|
||||
errors.append(
|
||||
"{}[Please pin requirement {}, see {}]".format(package, req, URL_PIN)
|
||||
)
|
||||
errors.append(f"{package}[Please pin requirement {req}, see {URL_PIN}]")
|
||||
reqs.setdefault(req, []).append(package)
|
||||
|
||||
|
||||
@@ -321,12 +315,12 @@ def generate_requirements_list(reqs):
|
||||
output = []
|
||||
for pkg, requirements in sorted(reqs.items(), key=lambda item: item[0]):
|
||||
for req in sorted(requirements):
|
||||
output.append("\n# {}".format(req))
|
||||
output.append(f"\n# {req}")
|
||||
|
||||
if comment_requirement(pkg):
|
||||
output.append("\n# {}\n".format(pkg))
|
||||
output.append(f"\n# {pkg}\n")
|
||||
else:
|
||||
output.append("\n{}\n".format(pkg))
|
||||
output.append(f"\n{pkg}\n")
|
||||
return "".join(output)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user