From 98993d8503eed0fbf5454bcada5c23ab038e8bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 27 Aug 2020 17:56:53 +0300 Subject: [PATCH] Trivial requirements cleanups (#39222) --- requirements_all.txt | 1 - requirements_test_all.txt | 1 - script/gen_requirements_all.py | 12 +++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index 8770a45a6f1..d6cd0e25a35 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1,5 +1,4 @@ # Home Assistant Core, full dependency set --c homeassistant/package_constraints.txt -r requirements.txt # homeassistant.components.nuimo_controller diff --git a/requirements_test_all.txt b/requirements_test_all.txt index ce7fd4090ff..d4025ebef3a 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1,7 +1,6 @@ # Home Assistant tests, full dependency set # Automatically generated by gen_requirements_all.py, do not edit --c homeassistant/package_constraints.txt -r requirements_test.txt # homeassistant.components.homekit diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 07883dc6221..e86953a6280 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -251,8 +251,7 @@ def requirements_output(reqs): def requirements_all_output(reqs): """Generate output for requirements_all.""" output = [ - "# Home Assistant Core, full dependency set\n" - "-c homeassistant/package_constraints.txt\n", + "# Home Assistant Core, full dependency set\n", "-r requirements.txt\n", ] output.append(generate_requirements_list(reqs)) @@ -260,15 +259,14 @@ def requirements_all_output(reqs): return "".join(output) -def requirements_test_output(reqs): +def requirements_test_all_output(reqs): """Generate output for test_requirements.""" output = [ "# Home Assistant tests, full dependency set\n", f"# Automatically generated by {Path(__file__).name}, do not edit\n", "\n", - "-c homeassistant/package_constraints.txt\n", + "-r requirements_test.txt\n", ] - output.append("-r requirements_test.txt\n") filtered = { requirement: modules @@ -347,7 +345,7 @@ def main(validate): reqs_file = requirements_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() constraints = gather_constraints() @@ -355,7 +353,7 @@ def main(validate): ("requirements.txt", reqs_file), ("requirements_all.txt", reqs_all_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), )