Tidy up package constraint messages (#61866)

Co-authored-by: epenet <epenet@users.noreply.github.com>
This commit is contained in:
epenet 2021-12-15 12:28:04 +01:00 committed by GitHub
parent a6f0492623
commit 25cf690b20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View file

@ -21,7 +21,6 @@ httpx==0.21.0
ifaddr==0.1.7
jinja2==3.0.3
paho-mqtt==1.6.1
pillow==8.2.0
pip>=8.0.3,<20.3
pyserial==3.5
python-slugify==4.0.1
@ -36,7 +35,11 @@ yarl==1.6.3
zeroconf==0.37.0
# Constrain pillow to 8.2.0 because later versions are causing issues in nightly builds.
# https://github.com/home-assistant/core/issues/61756
pillow==8.2.0
# Constrain pycryptodome to avoid vulnerability
# see https://github.com/home-assistant/core/pull/16238
pycryptodome>=3.6.6
# Constrain urllib3 to ensure we deal with CVE-2020-26137 and CVE-2021-33503

View file

@ -62,7 +62,11 @@ CONSTRAINT_PATH = os.path.join(
)
CONSTRAINT_BASE = """
# Constrain pillow to 8.2.0 because later versions are causing issues in nightly builds.
# https://github.com/home-assistant/core/issues/61756
pillow==8.2.0
# Constrain pycryptodome to avoid vulnerability
# see https://github.com/home-assistant/core/pull/16238
pycryptodome>=3.6.6
# Constrain urllib3 to ensure we deal with CVE-2020-26137 and CVE-2021-33503
@ -184,7 +188,7 @@ def gather_recursive_requirements(domain, seen=None):
seen.add(domain)
integration = Integration(Path(f"homeassistant/components/{domain}"))
integration.load_manifest()
reqs = set(integration.requirements)
reqs = {x for x in integration.requirements if x not in CONSTRAINT_BASE}
for dep_domain in integration.dependencies:
reqs.update(gather_recursive_requirements(dep_domain, seen))
return reqs