feat: add --no-hash option to update, preventing metadata.content-hash #2654
+12
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jul 11, 2020
Currently when creating a lockfile, a metadata.content-hash field is generated, containing the hash of the sorted contents of pyproject.toml. However (see python-poetry#496) this causes merge conflicts, particularly when using a tool such as dependabot that makes multiple parallel branches with dependency changes. Add a --no-hash option to poetry update. This causes metadata.content-hash to be omitted. In turn poetry will later complain that the lock file may not be fresh, (although it is correct), and the user can run poetry lock to update it, after all the merges are complete. dependabot currently runs `poetry update <DEPENDENCY> --lock`, I would propose to incrporate this PR to poetry and then modify dependabot to have teh --no-hash option.
|
Hi, @donbowman are you still interested in this topic? |
yes, dependabot still is inneficient for us. |
|
The Poetry team has decided to reject this idea. This doesn't solve the underlying issue, which is that there is no good way of having a more mergeable lock file with our current data model. |
|
See #496 for more discussion of this. |
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently when creating a lockfile, a metadata.content-hash field is
generated, containing the hash of the sorted contents of pyproject.toml.
However (see #496) this causes merge conflicts, particularly
when using a tool such as dependabot that makes multiple parallel
branches with dependency changes.
Add a --no-hash option to poetry update. This causes metadata.content-hash
to be omitted. In turn poetry will later complain that the lock file
may not be fresh, (although it is correct), and the user can run poetry lock
to update it, after all the merges are complete.
dependabot currently runs
poetry update <DEPENDENCY> --lock, I wouldpropose to incrporate this PR to poetry and then modify dependabot
to have teh --no-hash option.
Pull Request Check List
Resolves: #issue-number-here