Skip to content

Fold esphome-dsmr into esphome_dsmr - #135

Merged
frahlg merged 1 commit into
mainfrom
fold-esphome-dsmr
Sep 25, 2026
Merged

frahlg merged 1 commit into
mainfrom
fold-esphome-dsmr

Conversation

@frahlg

@frahlg frahlg commented Sep 25, 2026

Copy link
Copy Markdown
Member

Last open piece of the one-id work (srcfl/ftw#1423).

esphome-dsmr and esphome_dsmr were one driver for one device under two catalog ids. #132 kept both because sites installed esphome-dsmr from the channel: its artifacts have 38 beta and 11 stable downloads.

Change:

  • esphome_dsmr 1.0.6 declares replaces = { "esphome-dsmr" } in its DRIVER table.
  • The esphome-dsmr source and manifest are removed.

Installed copies:

  • Every published esphome-dsmr artifact stays in the signed channel's history. FTW's runtime policy looks installs up in drivers and history, so an installed copy keeps running.
  • A companion FTW PR moves a device that runs esphome-dsmr to the bundled esphome_dsmr at start. It rewrites the configured driver file and ends the old selection, reading replaces from the bundled driver.
  • Either merge order is safe: without the FTW side, installed copies simply keep running as today.

Evidence:

  • make check: 4594 passed.
  • tools/ftw_repository.py check-versions against the published drivers-beta manifest reports {"added": [], "changed": ["esphome_dsmr"], "drivers": 87}.

esphome-dsmr and esphome_dsmr were one driver for one device under two
catalog ids. esphome_dsmr 1.0.6 declares replaces = { "esphome-dsmr" }
in its DRIVER table so a host can move a device that runs the old entry,
and the esphome-dsmr source and manifest go. Its published artifacts
stay in the signed channel's history, so installed copies keep running.

Signed-off-by: Fredrik Ahlgren <fredrik@sourceful-labs.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-09-25T08:27:17.465332Z f85824d PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f85824d479

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@@ -1,27 +0,0 @@
name: "esphome-dsmr"
version: "1.0.3"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Record published 1.0.3 before deleting the manifest

The commit states that esphome-dsmr 1.0.3 has already been downloaded, but driver-history.json records only 1.0.1 and 1.0.2. After this manifest is deleted, tools/generate_history.py no longer scans the driver's Git history and merely carries forward those existing entries, so 1.0.3 can never be added by the normal release command. Preserve the published 1.0.3 entry before removing the catalog source so its exact bytes and originating commit remain traceable.

Useful? React with 👍 / 👎.

@frahlg
frahlg merged commit 1de2c5d into main Sep 25, 2026
5 checks passed
@frahlg
frahlg deleted the fold-esphome-dsmr branch September 25, 2026 08:29
frahlg added a commit to srcfl/ftw that referenced this pull request Sep 25, 2026
srcfl/device-drivers#135 folded the catalog entry esphome-dsmr into
esphome_dsmr, which declares replaces = { "esphome-dsmr" } in its
DRIVER table. At start, a configured driver that runs the owner's
selection of a replaced driver now names the release's file, the old
selection ends, and the settings are saved. An operator's own file of
the old name is left alone. The pin moves to device-drivers 92adaf0.


Claude-Session: https://claude.ai/code/session_01MuerPFZFG88kgu8sWVHeq7

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant