From e80ca38fc75fda9272ff7a615239095108c27a3a Mon Sep 17 00:00:00 2001 From: Denis Pitzalis Date: Sun, 1 Nov 2020 12:58:16 +0000 Subject: [PATCH 01/10] solve #42708 --- homeassistant/components/sensehat/manifest.json | 2 +- homeassistant/components/sensehat/sensor.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/sensehat/manifest.json b/homeassistant/components/sensehat/manifest.json index 3ce37884cd0b56..055bd9dd57263d 100644 --- a/homeassistant/components/sensehat/manifest.json +++ b/homeassistant/components/sensehat/manifest.json @@ -2,6 +2,6 @@ "domain": "sensehat", "name": "Sense HAT", "documentation": "https://www.home-assistant.io/integrations/sensehat", - "requirements": ["sense-hat==2.2.0"], + "requirements": ["sense-hat==2.2.0", "rtimulib==7.2.1"], "codeowners": [] } diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index 3966e52f1a8508..5463b7f008cd68 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -43,9 +43,8 @@ def get_cpu_temp(): """Get CPU temperature.""" - res = os.popen("vcgencmd measure_temp").readline() - t_cpu = float(res.replace("temp=", "").replace("'C\n", "")) - return t_cpu + t_cpu = os.popen("cat /sys/class/thermal/thermal_zone0/temp").readline() + return float(t_cpu) def get_average(temp_base): From beb6acca2fdd1e586a980ec2e00508a274a57813 Mon Sep 17 00:00:00 2001 From: Denix Date: Sun, 1 Nov 2020 14:18:28 +0100 Subject: [PATCH 02/10] Update manifest.json RTIMUlib requires to be installed manually. TODO --- homeassistant/components/sensehat/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensehat/manifest.json b/homeassistant/components/sensehat/manifest.json index 055bd9dd57263d..3ce37884cd0b56 100644 --- a/homeassistant/components/sensehat/manifest.json +++ b/homeassistant/components/sensehat/manifest.json @@ -2,6 +2,6 @@ "domain": "sensehat", "name": "Sense HAT", "documentation": "https://www.home-assistant.io/integrations/sensehat", - "requirements": ["sense-hat==2.2.0", "rtimulib==7.2.1"], + "requirements": ["sense-hat==2.2.0"], "codeowners": [] } From 32ab93bf585a4ed5bd482d89a3fda3331ffd4f9a Mon Sep 17 00:00:00 2001 From: Denix Date: Mon, 2 Nov 2020 13:28:05 +0100 Subject: [PATCH 03/10] Update sensor.py resolved comment --- homeassistant/components/sensehat/sensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index 5463b7f008cd68..c75e8dae8d747f 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -43,8 +43,8 @@ def get_cpu_temp(): """Get CPU temperature.""" - t_cpu = os.popen("cat /sys/class/thermal/thermal_zone0/temp").readline() - return float(t_cpu) + t_cpu = Path("/sys/class/thermal/thermal_zone0/temp").read_text().replace("\n", "") + return (float(t_cpu) * 0.001) def get_average(temp_base): From 92a815e0af5841bb23d8f9caa387e132a84bcbb7 Mon Sep 17 00:00:00 2001 From: Denix Date: Mon, 2 Nov 2020 13:38:23 +0100 Subject: [PATCH 04/10] Update sensor.py solved comment to PR. use strip instead of replace --- homeassistant/components/sensehat/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index c75e8dae8d747f..f5aefe7b1f90ee 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -43,7 +43,7 @@ def get_cpu_temp(): """Get CPU temperature.""" - t_cpu = Path("/sys/class/thermal/thermal_zone0/temp").read_text().replace("\n", "") + t_cpu = Path("/sys/class/thermal/thermal_zone0/temp").read_text().strip() return (float(t_cpu) * 0.001) From 665221cd68bbfe88043ecf39343e8d4483dbe03d Mon Sep 17 00:00:00 2001 From: Denix Date: Mon, 2 Nov 2020 13:51:32 +0100 Subject: [PATCH 05/10] Update sensor.py forgot to import pathlib --- homeassistant/components/sensehat/sensor.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index f5aefe7b1f90ee..1192c7daab0c5d 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -1,10 +1,7 @@ """Support for Sense HAT sensors.""" from datetime import timedelta +from pathlib import Path import logging -import os - -from sense_hat import SenseHat -import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( From a027c37f0b0879a244ccd7a6a67c1eb953e96c50 Mon Sep 17 00:00:00 2001 From: Denix Date: Mon, 2 Nov 2020 14:06:34 +0100 Subject: [PATCH 06/10] Update sensor.py serious problems with my cut&paste! --- homeassistant/components/sensehat/sensor.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index 1192c7daab0c5d..41ec539d3399c4 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -3,6 +3,9 @@ from pathlib import Path import logging +from sense_hat import SenseHat +import voluptuous as vol + from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( CONF_DISPLAY_OPTIONS, From a387df38db89a083fe5bab2b435b5afe46ced6f9 Mon Sep 17 00:00:00 2001 From: Denix Date: Mon, 2 Nov 2020 14:22:53 +0100 Subject: [PATCH 07/10] Update sensor.py fixed flake8: E221 multiple spaces before operator --- homeassistant/components/sensehat/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index 41ec539d3399c4..078fcbff0ac7b7 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -44,7 +44,7 @@ def get_cpu_temp(): """Get CPU temperature.""" t_cpu = Path("/sys/class/thermal/thermal_zone0/temp").read_text().strip() - return (float(t_cpu) * 0.001) + return (float(t_cpu) * 0.001) def get_average(temp_base): From 114ec9f0318f031733e4798a1c79e37014d6099b Mon Sep 17 00:00:00 2001 From: Denix Date: Mon, 2 Nov 2020 14:30:30 +0100 Subject: [PATCH 08/10] Update sensor.py fix black: 1 file reformatted, 2 files left unchanged. --- homeassistant/components/sensehat/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index 078fcbff0ac7b7..62dec690e94b2b 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -44,7 +44,7 @@ def get_cpu_temp(): """Get CPU temperature.""" t_cpu = Path("/sys/class/thermal/thermal_zone0/temp").read_text().strip() - return (float(t_cpu) * 0.001) + return float(t_cpu) * 0.001 def get_average(temp_base): From 53bf972ed7839db564f9c5f257cfb18e00f954eb Mon Sep 17 00:00:00 2001 From: Denix Date: Mon, 2 Nov 2020 14:32:58 +0100 Subject: [PATCH 09/10] Update sensor.py fix isort --- homeassistant/components/sensehat/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensehat/sensor.py b/homeassistant/components/sensehat/sensor.py index 62dec690e94b2b..67beb021d899bb 100644 --- a/homeassistant/components/sensehat/sensor.py +++ b/homeassistant/components/sensehat/sensor.py @@ -1,7 +1,7 @@ """Support for Sense HAT sensors.""" from datetime import timedelta -from pathlib import Path import logging +from pathlib import Path from sense_hat import SenseHat import voluptuous as vol From bffd12d4902958f52aefd688c3a3c4c6076fc803 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 06:04:47 +0000 Subject: [PATCH 10/10] Bump actions/checkout from 2 to 3.1.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.1.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3.1.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3d65df477e7605..a5f7ed19d30638 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} id: python uses: actions/setup-python@v2.1.2 @@ -71,7 +71,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -116,7 +116,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -161,7 +161,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -209,7 +209,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Register hadolint problem matcher run: | echo "::add-matcher::.github/workflows/matchers/hadolint.json" @@ -228,7 +228,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -276,7 +276,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -324,7 +324,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -369,7 +369,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -417,7 +417,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -463,7 +463,7 @@ jobs: # needs: prepare-base # steps: # - name: Check out code from GitHub - # uses: actions/checkout@v2 + # uses: actions/checkout@v3.1.0 # - name: Run ShellCheck # uses: ludeeus/action-shellcheck@0.3.0 @@ -473,7 +473,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -525,7 +525,7 @@ jobs: container: homeassistant/ci-azure:${{ matrix.python-version }} steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Restore full Python ${{ matrix.python-version }} virtual environment id: cache-venv @@ -553,7 +553,7 @@ jobs: needs: prepare-base steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} uses: actions/setup-python@v2.1.2 id: python @@ -589,7 +589,7 @@ jobs: container: homeassistant/ci-azure:${{ matrix.python-version }} steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Restore full Python ${{ matrix.python-version }} virtual environment id: cache-venv uses: actions/cache@v2 @@ -624,7 +624,7 @@ jobs: container: homeassistant/ci-azure:${{ matrix.python-version }} steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Restore full Python ${{ matrix.python-version }} virtual environment id: cache-venv uses: actions/cache@v2 @@ -658,7 +658,7 @@ jobs: container: homeassistant/ci-azure:${{ matrix.python-version }} steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Restore full Python ${{ matrix.python-version }} virtual environment id: cache-venv uses: actions/cache@v2 @@ -694,7 +694,7 @@ jobs: container: homeassistant/ci-azure:${{ matrix.python-version }} steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Restore full Python ${{ matrix.python-version }} virtual environment id: cache-venv uses: actions/cache@v2 @@ -754,7 +754,7 @@ jobs: container: homeassistant/ci-azure:${{ matrix.python-version }} steps: - name: Check out code from GitHub - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Restore full Python ${{ matrix.python-version }} virtual environment id: cache-venv uses: actions/cache@v2