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

setup: limit python-benedict version #6377

Merged
merged 1 commit into from
Aug 2, 2021
Merged

setup: limit python-benedict version #6377

merged 1 commit into from
Aug 2, 2021

Conversation

efiop
Copy link
Member

@efiop efiop commented Aug 2, 2021

Temporary fix for #6374 Kudos @skshetry

Thank you for the contribution - we'll try to review it as soon as possible. πŸ™

@efiop efiop requested a review from a team as a code owner August 2, 2021 17:21
@efiop efiop requested a review from pmrowla August 2, 2021 17:21
@efiop efiop added bugfix fixes bug skip-changelog Skips changelog labels Aug 2, 2021
@efiop efiop added this to In progress in DVC 27 Jul - 10 Aug via automation Aug 2, 2021
@efiop efiop merged commit 15de826 into master Aug 2, 2021
DVC 27 Jul - 10 Aug automation moved this from In progress to Done Aug 2, 2021
@efiop efiop deleted the efiop-patch-1 branch August 2, 2021 17:44
@skshetry
Copy link
Member

skshetry commented Aug 2, 2021

Sorry for being late. I have a patch that should fix this on #6378.

skshetry added a commit to skshetry/dvc that referenced this pull request Aug 2, 2021
@efiop
Copy link
Member Author

efiop commented Aug 2, 2021

@skshetry Oh, it is pretty late in your timezone so I thought you already were off and rushed this quick fix to restore CI. Thank you so much! πŸ™

efiop pushed a commit that referenced this pull request Aug 2, 2021
* Fix merging of params when empty

Recent release of python-benedict==0.24.1 started ignoring empty dictionaries
during merge. The way we expected to work was questionable and also how
benedict itself tries to handle the references to empty dictionary is
also questionable.

I consider this to be a proper way to handle this even if this gets fixed
on the benedict side.

* Revert "setup: limit python-benedict version (#6377)"

This reverts commit 15de826.

* add comment for why passing through benedict
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix fixes bug skip-changelog Skips changelog
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants