Merge pull request #530 from legrego/legrego/issue378

Remove deprecated locked/unlocked constants

Author: legrego

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.12-bookworm
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.13-bookworm
 
 RUN apt-get update && apt-get install -y apt-transport-https gnupg2 procps less curl
 
@@ -7,7 +7,7 @@ COPY ".devcontainer/install-docker-cli.sh" install-docker-cli.sh
 RUN /bin/bash install-docker-cli.sh
 
 # Install Poetry for dependency management
-RUN pip install poetry~=1.8
+RUN pip install poetry~=2.2.1
 
 # Install peek utility
 RUN pip install es-peek

.github/workflows/combined.yml

@@ -20,7 +20,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python3 -m pip install poetry~=1.8
+          python3 -m pip install poetry~=2.2.1
           poetry install
       - uses: "actions/checkout@v5"
       - name: HACS validation

.github/workflows/docs.yml

@@ -16,7 +16,7 @@ jobs:
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
       - uses: actions/setup-python@v6
         with:
-          python-version: 3.12
+          python-version: 3.13
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
       - uses: actions/cache@v4
         with:

.github/workflows/pull.yml

@@ -25,8 +25,8 @@ jobs:
       - uses: "actions/checkout@v5"
       - uses: "actions/setup-python@v6"
         with:
-          python-version: "3.12"
-      - run: python3 -m pip install poetry~=1.8
+          python-version: "3.13"
+      - run: python3 -m pip install poetry~=2.2.1
       - run: poetry install
       - run: poetry run ./scripts/lint --no-fix
 
@@ -39,9 +39,9 @@ jobs:
       - name: Setup Python
         uses: "actions/setup-python@v6"
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - name: Install requirements
-        run: python3 -m pip install poetry~=1.8 && poetry install
+        run: python3 -m pip install poetry~=2.2.1 && poetry install
       - name: Run tests
         run: |
           poetry run pytest --cov=./custom_components --cov-report=xml --cov-report=html

.ruff.toml

@@ -64,7 +64,6 @@ lint.select = [
     "S317", # suspicious-xml-sax-usage
     "S318", # suspicious-xml-mini-dom-usage
     "S319", # suspicious-xml-pull-dom-usage
-    "S320", # suspicious-xmle-tree-usage
     "S601", # paramiko-call
     "S602", # subprocess-popen-with-shell-equals-true
     "S604", # call-with-shell-equals-true
@@ -111,8 +110,6 @@ lint.ignore = [
     "SIM115", # Use context handler for opening files
     "TRY003", # Avoid specifying long messages outside the exception class
     "TRY400", # Use `logging.exception` instead of `logging.error`
-    # Ignored due to performance: https://github.com/charliermarsh/ruff/issues/2923
-    "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
 
     # May conflict with the formatter, https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
     "W191",

.vscode/settings.json

@@ -51,4 +51,7 @@
     "python.analysis.autoFormatStrings": true,
     "python.analysis.inlayHints.functionReturnTypes": true,
     "python.analysis.inlayHints.variableTypes": true,
+    "python-envs.defaultEnvManager": "ms-python.python:poetry",
+    "python-envs.defaultPackageManager": "ms-python.python:poetry",
+    "python-envs.pythonProjects": [],
 }

CONTRIBUTING.md

@@ -41,7 +41,7 @@ Report a bug by [opening a new issue](../../issues/new/choose); it's that easy!
 - What actually happens
 - Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
 
-People *love* thorough bug reports. I'm not even kidding.
+People _love_ thorough bug reports. I'm not even kidding.
 
 ## Use a Consistent Coding Style
 
@@ -53,14 +53,16 @@ Visual Studio Code is the recommended code editor for this project.
 This project includes a [devcontainer](./.devcontainer) configuration for an easy to use and consistent development environment. With this container you will have a stand alone Home Assistant instance running and already configured with the included [`configuration.yaml`](./config/configuration.yaml) file.
 
 ### Dependency management
+
 Dependencies are managed via [Poetry](https://python-poetry.org). This will be managed for you automatically if using the dev container. If you wish to run outside of a dev container, you will need to install your dependencies manually:
 
 ```sh
-pip install poetry~=1.8
+pip install poetry~=2.2.1
 poetry install
 ```
 
 ### Running tests
+
 Use `./scripts/test` to invoke the test runner.
 
 You must be within the virtual environment where project dependencies are installed:
@@ -78,11 +80,13 @@ poetry shell
 ```
 
 ### Updating snapshots
+
 If you've made a change to code that impacts a snapshot, your test will fail and the snapshot needs to be updated. To update snapshots run /bin/bash ./scripts/update_snapshots
 
 Or in vscode you can run one of the two update snapshot tasks by opening the command pallete with cmd + p (or ctrl + p), and type `task Update` to see the tasks related to updating snapshots.
 
 ### Linting
+
 In the devcontainer, linting and formatting runs on save and linting errors are showed as PROBLEMS in vscode.
 
 To invoke a full lint/format, in vscode open the command pallete with cmd + p (or ctrl + p), and type `task Lint`.

custom_components/elasticsearch/es_publish_pipeline.py

@@ -12,22 +12,32 @@
 from math import isinf, isnan
 from typing import TYPE_CHECKING, Any
 
+from homeassistant.components.lock.const import LockState
 from homeassistant.components.sun.const import STATE_ABOVE_HORIZON, STATE_BELOW_HORIZON
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     EVENT_STATE_CHANGED,
     STATE_CLOSED,
     STATE_HOME,
-    STATE_LOCKED,
     STATE_NOT_HOME,
     STATE_OFF,
     STATE_ON,
     STATE_OPEN,
     STATE_UNKNOWN,
-    STATE_UNLOCKED,
 )
-from homeassistant.core import Event, EventStateChangedData, HomeAssistant, State, callback
-from homeassistant.helpers import area_registry, device_registry, entity_registry, label_registry
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+)
+from homeassistant.helpers import (
+    area_registry,
+    device_registry,
+    entity_registry,
+    label_registry,
+)
 from homeassistant.helpers import state as state_helper
 from homeassistant.util import dt as dt_util
 from homeassistant.util.logging import async_create_catching_coro
@@ -504,7 +514,10 @@ class Formatter:
         """Formats state changes into documents."""
 
         def __init__(
-            self, hass: HomeAssistant, settings: PipelineSettings, log: Logger = BASE_LOGGER
+            self,
+            hass: HomeAssistant,
+            settings: PipelineSettings,
+            log: Logger = BASE_LOGGER,
         ) -> None:
             """Initialize the formatter."""
             self._logger = log if log else BASE_LOGGER
@@ -547,7 +560,10 @@ def _state_to_extended_details(self, state: State) -> dict:
             document["friendly_name"] = state.name
 
             if state.attributes.get("longitude") and state.attributes.get("latitude"):
-                document["location"] = [state.attributes.get("longitude"), state.attributes.get("latitude")]
+                document["location"] = [
+                    state.attributes.get("longitude"),
+                    state.attributes.get("latitude"),
+                ]
 
             return document
 
@@ -692,7 +708,7 @@ def state_as_boolean(cls, state: State) -> bool:
             if state.state in (
                 "true",
                 STATE_ON,
-                STATE_LOCKED,
+                LockState.LOCKED,
                 STATE_ABOVE_HORIZON,
                 STATE_OPEN,
                 STATE_HOME,
@@ -701,7 +717,7 @@ def state_as_boolean(cls, state: State) -> bool:
             if state.state in (
                 "false",
                 STATE_OFF,
-                STATE_UNLOCKED,
+                LockState.UNLOCKED,
                 STATE_UNKNOWN,
                 STATE_BELOW_HORIZON,
                 STATE_CLOSED,

docs/index.md

@@ -1,6 +1,7 @@
 ---
 title: Introduction
 ---
+
 # Elasticsearch Component for Home-Assistant
 
 Publish Home Assistant events to your [Elasticsearch](https://elastic.co) cluster!
@@ -17,7 +18,7 @@ Publish Home Assistant events to your [Elasticsearch](https://elastic.co) cluste
 - Elasticsearch 8.14+ (Self, [Cloud](https://www.elastic.co/cloud), or [Serverless](https://www.elastic.co/docs/current/serverless)).
 - [Elastic Common Schema version 1.0.0](https://github.com/elastic/ecs/releases/tag/v1.0.0)
 - [Home Assistant Community Store](https://github.com/custom-components/hacs)
-- Home Assistant >= 2024.6
+- Home Assistant >= 2025.6
 
 ## Older versions
 

hacs.json

@@ -1,5 +1,5 @@
 {
   "name": "Elasticsearch",
   "render_readme": true,
-  "homeassistant": "2024.6.0"
+  "homeassistant": "2025.6.0"
 }