From e3b42b2d26e6f1c55b59c04dcc34fd96394480c6 Mon Sep 17 00:00:00 2001 From: Ludeeus Date: Thu, 11 Feb 2021 12:56:56 +0000 Subject: [PATCH 1/5] Remove dockerfile --- helpers/requirements/Dockerfile | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 helpers/requirements/Dockerfile diff --git a/helpers/requirements/Dockerfile b/helpers/requirements/Dockerfile deleted file mode 100644 index 960e6b1..0000000 --- a/helpers/requirements/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM homeassistant/home-assistant:beta - -COPY . /entry/requirements - -WORKDIR /entry - -RUN \ - apk add --no-cache \ - alpine-sdk \ - libffi-dev \ - openssl-dev \ - python3-dev \ - glib-dev \ - \ - && python3 -m pip --disable-pip-version-check install -U \ - setuptools \ - && python3 -m pip install \ - pipdeptree==1.0.0 \ - stdlib-list==0.7.0 \ - tqdm - -ENTRYPOINT ["python3", "-m", "requirements"] \ No newline at end of file From e43560ca644d58485369682f7740c80c8832ef54 Mon Sep 17 00:00:00 2001 From: Ludeeus Date: Thu, 11 Feb 2021 13:02:29 +0000 Subject: [PATCH 2/5] debug --- helpers/requirements/run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/requirements/run.sh b/helpers/requirements/run.sh index f0b1736..a97551f 100644 --- a/helpers/requirements/run.sh +++ b/helpers/requirements/run.sh @@ -3,4 +3,5 @@ mkdir -p /action mv /validate /action/validate cd /action || exit 1 +cat ./requirements.json python3 -m validate \ No newline at end of file From 1563ac343dc04748044a8b36e47ddd6b20c4f9e2 Mon Sep 17 00:00:00 2001 From: Ludeeus Date: Thu, 11 Feb 2021 13:03:18 +0000 Subject: [PATCH 3/5] debug --- helpers/requirements/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/requirements/run.sh b/helpers/requirements/run.sh index a97551f..2871386 100644 --- a/helpers/requirements/run.sh +++ b/helpers/requirements/run.sh @@ -3,5 +3,5 @@ mkdir -p /action mv /validate /action/validate cd /action || exit 1 -cat ./requirements.json +cat /action/validate/requirements.json python3 -m validate \ No newline at end of file From 7463c1e696cf728a5257b81c9b733942d01a1163 Mon Sep 17 00:00:00 2001 From: Ludeeus Date: Thu, 11 Feb 2021 13:07:08 +0000 Subject: [PATCH 4/5] fix --- checks/requirements | 3 +-- helpers/requirements/__init__.py | 3 +-- helpers/requirements/run.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/checks/requirements b/checks/requirements index 3a88715..9c09d6e 100644 --- a/checks/requirements +++ b/checks/requirements @@ -19,11 +19,10 @@ function checkRun () { mkdir -p "$repoPath/requirements" git clone --depth 1 https://github.com/home-assistant/wheels-custom-integrations.git "$repoPath/wheels-custom-integrations" cd "$repoPath/wheels-custom-integrations" - jq -r .requirements "$GITHUB_ACTION_PATH/data/manifest.json" > "$repoPath/wheels-custom-integrations/validate_requirements/requirements.json" + jq -r .requirements "$GITHUB_ACTION_PATH/data/manifest.json" > "$repoPath/wheels-custom-integrations/validate_requirements/files.json" jq . "$repoPath/wheels-custom-integrations/validate_requirements/requirements.json" cp "$GITHUB_ACTION_PATH/helpers/requirements/__init__.py" "$repoPath/wheels-custom-integrations/validate_requirements" cp "$GITHUB_ACTION_PATH/helpers/requirements/run.sh" "$repoPath/wheels-custom-integrations/validate_requirements" - touch "$repoPath/wheels-custom-integrations/validate_requirements/files.json" docker build -t validate -f validate_requirements/Dockerfile . set +e docker run --rm validate diff --git a/helpers/requirements/__init__.py b/helpers/requirements/__init__.py index 3d79d63..3e80c6b 100644 --- a/helpers/requirements/__init__.py +++ b/helpers/requirements/__init__.py @@ -13,9 +13,8 @@ def validate() -> bool: """Do the validation.""" print("Validating requirements") print() - piped_input = sys.stdin.read() requirements = [] - with open("/action/validate/requirements.json", "r") as requirements_file: + with open("/action/validate/files.json", "r") as requirements_file: requirements = json.loads(requirements_file.read()) validated_ok = True print("Requirements to validate:", len(requirements)) diff --git a/helpers/requirements/run.sh b/helpers/requirements/run.sh index 2871386..6970f63 100644 --- a/helpers/requirements/run.sh +++ b/helpers/requirements/run.sh @@ -3,5 +3,5 @@ mkdir -p /action mv /validate /action/validate cd /action || exit 1 -cat /action/validate/requirements.json +cat /action/validate/files.json python3 -m validate \ No newline at end of file From a614514e9dac9722cd458a0dcbaa3e08fec495dc Mon Sep 17 00:00:00 2001 From: Ludeeus Date: Thu, 11 Feb 2021 13:09:52 +0000 Subject: [PATCH 5/5] remove line --- checks/requirements | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/requirements b/checks/requirements index 9c09d6e..f76c99c 100644 --- a/checks/requirements +++ b/checks/requirements @@ -20,7 +20,6 @@ function checkRun () { git clone --depth 1 https://github.com/home-assistant/wheels-custom-integrations.git "$repoPath/wheels-custom-integrations" cd "$repoPath/wheels-custom-integrations" jq -r .requirements "$GITHUB_ACTION_PATH/data/manifest.json" > "$repoPath/wheels-custom-integrations/validate_requirements/files.json" - jq . "$repoPath/wheels-custom-integrations/validate_requirements/requirements.json" cp "$GITHUB_ACTION_PATH/helpers/requirements/__init__.py" "$repoPath/wheels-custom-integrations/validate_requirements" cp "$GITHUB_ACTION_PATH/helpers/requirements/run.sh" "$repoPath/wheels-custom-integrations/validate_requirements" docker build -t validate -f validate_requirements/Dockerfile .