Trivial requirements cleanups (#39222)

This commit is contained in:
Ville Skyttä 2020-08-27 17:56:53 +03:00 committed by GitHub
parent b880c33043
commit 98993d8503
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions

View file

@ -1,5 +1,4 @@
# Home Assistant Core, full dependency set # Home Assistant Core, full dependency set
-c homeassistant/package_constraints.txt
-r requirements.txt -r requirements.txt
# homeassistant.components.nuimo_controller # homeassistant.components.nuimo_controller

View file

@ -1,7 +1,6 @@
# Home Assistant tests, full dependency set # Home Assistant tests, full dependency set
# Automatically generated by gen_requirements_all.py, do not edit # Automatically generated by gen_requirements_all.py, do not edit
-c homeassistant/package_constraints.txt
-r requirements_test.txt -r requirements_test.txt
# homeassistant.components.homekit # homeassistant.components.homekit

View file

@ -251,8 +251,7 @@ def requirements_output(reqs):
def requirements_all_output(reqs): def requirements_all_output(reqs):
"""Generate output for requirements_all.""" """Generate output for requirements_all."""
output = [ output = [
"# Home Assistant Core, full dependency set\n" "# Home Assistant Core, full dependency set\n",
"-c homeassistant/package_constraints.txt\n",
"-r requirements.txt\n", "-r requirements.txt\n",
] ]
output.append(generate_requirements_list(reqs)) output.append(generate_requirements_list(reqs))
@ -260,15 +259,14 @@ def requirements_all_output(reqs):
return "".join(output) return "".join(output)
def requirements_test_output(reqs): def requirements_test_all_output(reqs):
"""Generate output for test_requirements.""" """Generate output for test_requirements."""
output = [ output = [
"# Home Assistant tests, full dependency set\n", "# Home Assistant tests, full dependency set\n",
f"# Automatically generated by {Path(__file__).name}, do not edit\n", f"# Automatically generated by {Path(__file__).name}, do not edit\n",
"\n", "\n",
"-c homeassistant/package_constraints.txt\n", "-r requirements_test.txt\n",
] ]
output.append("-r requirements_test.txt\n")
filtered = { filtered = {
requirement: modules requirement: modules
@ -347,7 +345,7 @@ def main(validate):
reqs_file = requirements_output(data) reqs_file = requirements_output(data)
reqs_all_file = requirements_all_output(data) reqs_all_file = requirements_all_output(data)
reqs_test_file = requirements_test_output(data) reqs_test_all_file = requirements_test_all_output(data)
reqs_pre_commit_file = requirements_pre_commit_output() reqs_pre_commit_file = requirements_pre_commit_output()
constraints = gather_constraints() constraints = gather_constraints()
@ -355,7 +353,7 @@ def main(validate):
("requirements.txt", reqs_file), ("requirements.txt", reqs_file),
("requirements_all.txt", reqs_all_file), ("requirements_all.txt", reqs_all_file),
("requirements_test_pre_commit.txt", reqs_pre_commit_file), ("requirements_test_pre_commit.txt", reqs_pre_commit_file),
("requirements_test_all.txt", reqs_test_file), ("requirements_test_all.txt", reqs_test_all_file),
("homeassistant/package_constraints.txt", constraints), ("homeassistant/package_constraints.txt", constraints),
) )