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 including from sub dir #18378

Merged
merged 1 commit into from Nov 11, 2018

Conversation

Projects
None yet
3 participants
@bramkragten
Member

bramkragten commented Nov 11, 2018

The include path is now always relative to the root of the config dir.

Description:

After the first include the path would be based on the included file, so multiple includes from sub dirs would fail.

Should go in a hotfix.

Related issue (if applicable): fixes #

Pull request in home-assistant.io with documentation (if applicable): home-assistant/home-assistant.io#<home-assistant.io PR number goes here>

Example entry for configuration.yaml (if applicable):

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.

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

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

  • New dependencies have been added to the REQUIREMENTS variable (example).
  • New dependencies are only imported inside functions that use them (example).
  • New or updated dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
  • New files were added to .coveragerc.

If the code does not interact with devices:

  • Tests have been added to verify that the new code works.
Fix including from sub dir
The include path is now always relative to the root of the config dir.

@bramkragten bramkragten requested a review from home-assistant/core as a code owner Nov 11, 2018

@wafflebot wafflebot bot added the in progress label Nov 11, 2018

@balloob balloob added this to the 0.82.1 milestone Nov 11, 2018

@balloob balloob merged commit b8c06ad into home-assistant:dev Nov 11, 2018

5 checks passed

Hound No violations found. Woof!
WIP Legacy commit status override — see details
Details
cla-bot Everyone involved has signed the CLA
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.002%) to 93.035%
Details

@wafflebot wafflebot bot removed the in progress label Nov 11, 2018

@bramkragten bramkragten deleted the bramkragten:ruamel-include-sub-dir branch Nov 12, 2018

zxdavb added a commit to zxdavb/home-assistant that referenced this pull request Nov 13, 2018

Fix including from sub dir (home-assistant#18378)
The include path is now always relative to the root of the config dir.

balloob added a commit that referenced this pull request Nov 15, 2018

Fix including from sub dir (#18378)
The include path is now always relative to the root of the config dir.

@balloob balloob referenced this pull request Nov 15, 2018

Merged

0.82.1 #18481

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment