Merge remote-tracking branch 'refs/remotes/blueprint/dev' into dev

# Conflicts: # README.md # README_EXAMPLE.md # custom_components/integration_blueprint/__init__.py # custom_components/integration_blueprint/config_flow.py # custom_components/integration_blueprint/coordinator.py # custom_components/integration_blueprint/manifest.json # custom_components/integration_blueprint/translations/en.json
Limych · Jan 4, 2025 · 8faeee4 · 8faeee4
2 parents b5d2a8c + 095edf4
commit 8faeee4
Show file tree

Hide file tree

Showing 17 changed files with 120 additions and 165 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -37,5 +37,13 @@
         }
     },
     "remoteUser": "vscode",
-    "features": {}
+    "features": {
+        "ghcr.io/devcontainers-extra/features/apt-packages:1": {
+            "packages": [
+                "ffmpeg",
+                "libturbojpeg0",
+                "libpcap-dev"
+            ]
+        }
+    }
 }
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -44,7 +44,7 @@ body:
 - type: textarea
   attributes:
     label: "Debug logs"
-    description: "To enable debug logs check this https://www.home-assistant.io/integrations/logger/, this **needs** to install _everything_ from startup of Home Assistant to the point where you encounter the issue."
+    description: "To enable debug logs check this https://www.home-assistant.io/integrations/logger/, this **needs** to include _everything_ from startup of Home Assistant to the point where you encounter the issue."
     render: text
   validations:
     required: true

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -67,7 +67,8 @@
 
 - [ ] The code change is tested and works locally.
 - [ ] There is no commented out code in this PR.
-- [ ] The code has been formatted using Black (`black --fast custom_components`)
+- [ ] The code has been formatted using Ruff (`python3 -m ruff format custom_components`)
+- [ ] The code quality has been checked using Ruff (`python3 -m ruff check custom_components --fix`)
 
 If user exposed functionality or configuration variables are added/changed:
 

diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
@@ -0,0 +1,18 @@
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action
+# to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Schedule for five minutes after the hour, every hour
+    - cron: '5 * * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/[email protected]
+        with:
+          token: ${{ github.token }}
diff --git a/.github/workflows/py-dead-code.yml b/.github/workflows/py-dead-code.yml
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
         - name: "Checkout the repository"
-          uses: "actions/checkout@v4.1.7"
+          uses: "actions/checkout@v4.2.2"
 
         - name: "Run hassfest validation"
           uses: "home-assistant/actions/hassfest@master"
@@ -27,7 +27,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
         - name: "Checkout the repository"
-          uses: "actions/checkout@v4.1.7"
+          uses: "actions/checkout@v4.2.2"
 
         - name: "Run HACS validation"
           uses: "hacs/action@main"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,26 +9,17 @@ repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     rev: v0.6.9
     hooks:
+      - id: ruff-format
+        files: ^(custom_components|bin|tests)/.+\.py$
       - id: ruff
         args: [ --fix ]
         files: ^(custom_components|bin|tests)/.+\.py$
-      - id: ruff-format
-        files: ^(custom_components|bin|tests)/.+\.py$
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [ --py312-plus ]
         stages: [manual]
-  - repo: https://github.com/pycqa/flake8.git
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-docstrings==1.5.0
-          - pydocstyle==5.0.2
-        files: ^(custom_components|bin|tests)/.+\.py$
-        stages: [manual]
   - repo: https://github.com/PyCQA/bandit
     rev: 1.7.8
     hooks:

diff --git a/.ruff.toml b/.ruff.toml
@@ -7,7 +7,6 @@ select = [
     "ALL",
 ]
 ignore = [
-    "ANN101", # Missing type annotation for `self` in method
     "ANN401", # Dynamically typed expressions (typing.Any) are disallowed
     "D203", # no-blank-line-before-class (incompatible with formatter)
     "D212", # multi-line-summary-first-line (incompatible with formatter)
@@ -27,4 +26,15 @@ keep-runtime-typing = true
 max-complexity = 25
 
 [lint.per-file-ignores]
-"tests/*.py" = ["ANN001", "ANN201", "ARG001", "PLR2004", "S101", "S311", "SLF001"]
+"**/tests/**.py" = [
+    "ANN001", # missing-type-function-argument
+    "ANN201", # missing-return-type-undocumented-public-function
+    "ARG001", # unused-function-argument
+    "PLR2004", # magic-value-comparison
+    "S101", # assert
+    "S311", # suspicious-non-cryptographic-random-usage
+    "SLF001", # private-member-access
+    "S105", # hardcoded-password-string
+    "S106", # hardcoded-password-func-arg
+    "S107", # hardcoded-password-default
+]
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/hacs.json b/hacs.json
@@ -1,6 +1,7 @@
 {
     "name": "Indoor Air Quality UK Index",
     "hide_default_branch": true,
-    "homeassistant": "2024.6.0",
+    "homeassistant": "2024.12.0",
+    "hacs": "2.0.1",
     "render_readme": true
 }
diff --git a/pylintrc b/pylintrc
diff --git a/pyproject.toml b/pyproject.toml
@@ -197,6 +197,60 @@ ignore = [
     "E731",  # do not assign a lambda expression, use a def
 ]
 
+[tool.ruff.lint.flake8-import-conventions.extend-aliases]
+voluptuous = "vol"
+"homeassistant.components.air_quality.PLATFORM_SCHEMA" = "AIR_QUALITY_PLATFORM_SCHEMA"
+"homeassistant.components.alarm_control_panel.PLATFORM_SCHEMA" = "ALARM_CONTROL_PANEL_PLATFORM_SCHEMA"
+"homeassistant.components.binary_sensor.PLATFORM_SCHEMA" = "BINARY_SENSOR_PLATFORM_SCHEMA"
+"homeassistant.components.button.PLATFORM_SCHEMA" = "BUTTON_PLATFORM_SCHEMA"
+"homeassistant.components.calendar.PLATFORM_SCHEMA" = "CALENDAR_PLATFORM_SCHEMA"
+"homeassistant.components.camera.PLATFORM_SCHEMA" = "CAMERA_PLATFORM_SCHEMA"
+"homeassistant.components.climate.PLATFORM_SCHEMA" = "CLIMATE_PLATFORM_SCHEMA"
+"homeassistant.components.conversation.PLATFORM_SCHEMA" = "CONVERSATION_PLATFORM_SCHEMA"
+"homeassistant.components.cover.PLATFORM_SCHEMA" = "COVER_PLATFORM_SCHEMA"
+"homeassistant.components.date.PLATFORM_SCHEMA" = "DATE_PLATFORM_SCHEMA"
+"homeassistant.components.datetime.PLATFORM_SCHEMA" = "DATETIME_PLATFORM_SCHEMA"
+"homeassistant.components.device_tracker.PLATFORM_SCHEMA" = "DEVICE_TRACKER_PLATFORM_SCHEMA"
+"homeassistant.components.event.PLATFORM_SCHEMA" = "EVENT_PLATFORM_SCHEMA"
+"homeassistant.components.fan.PLATFORM_SCHEMA" = "FAN_PLATFORM_SCHEMA"
+"homeassistant.components.geo_location.PLATFORM_SCHEMA" = "GEO_LOCATION_PLATFORM_SCHEMA"
+"homeassistant.components.humidifier.PLATFORM_SCHEMA" = "HUMIDIFIER_PLATFORM_SCHEMA"
+"homeassistant.components.image.PLATFORM_SCHEMA" = "IMAGE_PLATFORM_SCHEMA"
+"homeassistant.components.image_processing.PLATFORM_SCHEMA" = "IMAGE_PROCESSING_PLATFORM_SCHEMA"
+"homeassistant.components.lawn_mower.PLATFORM_SCHEMA" = "LAWN_MOWER_PLATFORM_SCHEMA"
+"homeassistant.components.light.PLATFORM_SCHEMA" = "LIGHT_PLATFORM_SCHEMA"
+"homeassistant.components.lock.PLATFORM_SCHEMA" = "LOCK_PLATFORM_SCHEMA"
+"homeassistant.components.media_player.PLATFORM_SCHEMA" = "MEDIA_PLAYER_PLATFORM_SCHEMA"
+"homeassistant.components.notify.PLATFORM_SCHEMA" = "NOTIFY_PLATFORM_SCHEMA"
+"homeassistant.components.number.PLATFORM_SCHEMA" = "NUMBER_PLATFORM_SCHEMA"
+"homeassistant.components.remote.PLATFORM_SCHEMA" = "REMOTE_PLATFORM_SCHEMA"
+"homeassistant.components.scene.PLATFORM_SCHEMA" = "SCENE_PLATFORM_SCHEMA"
+"homeassistant.components.select.PLATFORM_SCHEMA" = "SELECT_PLATFORM_SCHEMA"
+"homeassistant.components.sensor.PLATFORM_SCHEMA" = "SENSOR_PLATFORM_SCHEMA"
+"homeassistant.components.siren.PLATFORM_SCHEMA" = "SIREN_PLATFORM_SCHEMA"
+"homeassistant.components.stt.PLATFORM_SCHEMA" = "STT_PLATFORM_SCHEMA"
+"homeassistant.components.switch.PLATFORM_SCHEMA" = "SWITCH_PLATFORM_SCHEMA"
+"homeassistant.components.text.PLATFORM_SCHEMA" = "TEXT_PLATFORM_SCHEMA"
+"homeassistant.components.time.PLATFORM_SCHEMA" = "TIME_PLATFORM_SCHEMA"
+"homeassistant.components.todo.PLATFORM_SCHEMA" = "TODO_PLATFORM_SCHEMA"
+"homeassistant.components.tts.PLATFORM_SCHEMA" = "TTS_PLATFORM_SCHEMA"
+"homeassistant.components.vacuum.PLATFORM_SCHEMA" = "VACUUM_PLATFORM_SCHEMA"
+"homeassistant.components.valve.PLATFORM_SCHEMA" = "VALVE_PLATFORM_SCHEMA"
+"homeassistant.components.update.PLATFORM_SCHEMA" = "UPDATE_PLATFORM_SCHEMA"
+"homeassistant.components.wake_word.PLATFORM_SCHEMA" = "WAKE_WORD_PLATFORM_SCHEMA"
+"homeassistant.components.water_heater.PLATFORM_SCHEMA" = "WATER_HEATER_PLATFORM_SCHEMA"
+"homeassistant.components.weather.PLATFORM_SCHEMA" = "WEATHER_PLATFORM_SCHEMA"
+"homeassistant.core.DOMAIN" = "HOMEASSISTANT_DOMAIN"
+"homeassistant.helpers.area_registry" = "ar"
+"homeassistant.helpers.category_registry" = "cr"
+"homeassistant.helpers.config_validation" = "cv"
+"homeassistant.helpers.device_registry" = "dr"
+"homeassistant.helpers.entity_registry" = "er"
+"homeassistant.helpers.floor_registry" = "fr"
+"homeassistant.helpers.issue_registry" = "ir"
+"homeassistant.helpers.label_registry" = "lr"
+"homeassistant.util.dt" = "dt_util"
+
 [tool.ruff.flake8-pytest-style]
 fixture-parentheses = false
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,4 @@
 -r requirements-test.txt
-black~=24.8
-packaging~=24.1
+packaging~=24.2
 pre-commit~=4.0
-PyGithub~=2.4
-pyupgrade~=3.17
-yamllint~=1.35
+PyGithub~=2.5
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,12 +1,8 @@
 -r requirements.txt
 async-timeout
 asynctest~=0.13
-colorlog~=6.8
-flake8~=7.1
-flake8-docstrings~=1.7
-mypy~=1.11
-pylint~=3.3
-pylint-strict-informational==0.1
+colorlog~=6.9
+mypy~=1.14
 pytest>=7.2
 pytest-cov>=3.0
 pytest-homeassistant-custom-component>=0.13

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-homeassistant>=2024.6.0
+homeassistant>=2024.11.0
 pip>=21.3.1