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.

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

Fix loading empty yaml files with include_dir_named #107853

Merged
merged 1 commit into from Jan 16, 2024

Conversation

pedrolamas
Copy link
Contributor

@pedrolamas pedrolamas commented Jan 12, 2024

Proposed change

This PR partially reverts the changes from #103912 as these have broken loading of packages with include_dir_named.

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:

@home-assistant home-assistant bot added bugfix cla-signed core small-pr PRs with less than 30 lines. labels Jan 12, 2024
@pedrolamas pedrolamas marked this pull request as ready for review January 12, 2024 10:42
@pedrolamas pedrolamas requested a review from a team as a code owner January 12, 2024 10:42
@pedrolamas
Copy link
Contributor Author

Apologies for the pushing my luck here, but this is quite a nasty bug (I am assuming this is a bug as the consequences of the original change impact a lot of users and as far as I can see, they were not documented), so I just wanted to see if I can get this prioritised for checking please?

@emontnemery emontnemery added this to the 2024.1.4 milestone Jan 16, 2024
Copy link
Contributor

@emontnemery emontnemery left a comment

Choose a reason for hiding this comment

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

Thanks @pedrolamas 👍

@emontnemery
Copy link
Contributor

This PR allows empty yaml files when using !include_dir_named.
Should we also allow empty files when using !include_dir_list?

@emontnemery emontnemery merged commit 6cab448 into home-assistant:dev Jan 16, 2024
53 checks passed
@pedrolamas pedrolamas deleted the pedrolamas/fix-107166 branch January 16, 2024 09:29
@pedrolamas
Copy link
Contributor Author

Should we also allow empty files when using !include_dir_list?

My understanding (which might be wrong) is that only include_dir_named maps with the filename, all the others will ignore the filename and just consider the file content.

@github-actions github-actions bot locked and limited conversation to collaborators Jan 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pxkages (or include_dir_named?) broken in 2024.1
3 participants