Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix empty files included by !include_dir_named #108489

Merged
merged 2 commits into from Jan 20, 2024
Merged

Fix empty files included by !include_dir_named #108489

merged 2 commits into from Jan 20, 2024

Conversation

emontnemery
Copy link
Contributor

@emontnemery emontnemery commented Jan 20, 2024 •
edited by joostlek

Proposed change

This is the 2nd try to restore the behavior of !include_dir_named which was changed by #103912, the solution in #107853 did not work in all cases

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@emontnemery emontnemery requested a review from a team as a code owner January 20, 2024 12:17
@home-assistant home-assistant bot added cla-signed core small-pr PRs with less than 30 lines. labels Jan 20, 2024
@emontnemery emontnemery added this to the 2024.1.5 milestone Jan 20, 2024
joostlek
joostlek approved these changes Jan 20, 2024
View reviewed changes
homeassistant/util/yaml/loader.py Outdated Show resolved Hide resolved
frenck
frenck approved these changes Jan 20, 2024
View reviewed changes
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

Thanks, @emontnemery 👍

../Frenck

@frenck frenck merged commit 1cb5bbf into dev Jan 20, 2024
53 checks passed
@frenck frenck deleted the include_dir_named branch January 20, 2024 14:12
frenck pushed a commit that referenced this pull request Jan 20, 2024
@emontnemery @joostlek @frenck
Fix empty files included by !include_dir_named (#108489)
ea8fc64 
Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
@frenck frenck mentioned this pull request Jan 20, 2024
Merged
This was referenced Jan 20, 2024
Closed
Closed
Closed
Closed
nrdufour added a commit to nrdufour/home-ops that referenced this pull request Jan 21, 2024
@nrdufour
chore(deps): update ghcr.io/home-assistant/home-assistant docker tag …
02a3416 
…to v2024.1.5 (#324)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ghcr.io/home-assistant/home-assistant](https://www.home-assistant.io/) ([source](https://github.com/home-assistant/core)) | patch | `2024.1.4` -> `2024.1.5` |

---

### Release Notes

<details>
<summary>home-assistant/core (ghcr.io/home-assistant/home-assistant)</summary>

### [`v2024.1.5`](https://github.com/home-assistant/core/releases/tag/2024.1.5)

[Compare Source](home-assistant/core@2024.1.4...2024.1.5)

-   Bump async-upnp-client to 0.38.1 ([@&#8203;StevenLooman] - [#&#8203;108382]) ([upnp docs]) ([yeelight docs]) ([dlna_dmr docs]) ([samsungtv docs]) ([ssdp docs]) ([dlna_dms docs]) (dependency)
-   Fix empty files included by !include_dir_named ([@&#8203;emontnemery] - [#&#8203;108489])
-   Pin pandas to 2.1.4 ([@&#8203;frenck] - [#&#8203;108509])

[#&#8203;106970]: home-assistant/core#106970

[#&#8203;107239]: home-assistant/core#107239

[#&#8203;107365]: home-assistant/core#107365

[#&#8203;107883]: home-assistant/core#107883

[#&#8203;108379]: home-assistant/core#108379

[#&#8203;108382]: home-assistant/core#108382

[#&#8203;108489]: home-assistant/core#108489

[#&#8203;108509]: home-assistant/core#108509

[@&#8203;StevenLooman]: https://github.com/StevenLooman

[@&#8203;emontnemery]: https://github.com/emontnemery

[@&#8203;frenck]: https://github.com/frenck

[dlna_dmr docs]: https://www.home-assistant.io/integrations/dlna_dmr/

[dlna_dms docs]: https://www.home-assistant.io/integrations/dlna_dms/

[enigma2 docs]: https://www.home-assistant.io/integrations/enigma2/

[samsungtv docs]: https://www.home-assistant.io/integrations/samsungtv/

[shelly docs]: https://www.home-assistant.io/integrations/shelly/

[ssdp docs]: https://www.home-assistant.io/integrations/ssdp/

[streamlabswater docs]: https://www.home-assistant.io/integrations/streamlabswater/

[system_bridge docs]: https://www.home-assistant.io/integrations/system_bridge/

[upnp docs]: https://www.home-assistant.io/integrations/upnp/

[yeelight docs]: https://www.home-assistant.io/integrations/yeelight/

[zha docs]: https://www.home-assistant.io/integrations/zha/

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNDAuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE0MC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/324
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
@github-actions github-actions bot locked and limited conversation to collaborators Jan 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@frenck frenck frenck approved these changes

@joostlek joostlek joostlek approved these changes

Assignees
No one assigned
Labels
cherry-picked cla-signed core small-pr PRs with less than 30 lines.
Projects
None yet
Milestone
2024.1.5
3 participants
@emontnemery @frenck @joostlek