Bring back the fix of #3147 #3213
Merged
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
Signed-off-by: frostming <mianghong@gmail.com>
techalchemy
approved these changes
Nov 13, 2018
There was a problem hiding this comment.
Thanks, this seems like a fine reimplementation, like I mentioned in the comments I was debating whether to merge in the hashes in case there were other hashes we picked up on PyPI which we would wind up overwriting... no idea if that's a good idea or not though so we should just move forward
| if self.results is not None: | ||
| resolved_hashes = self.resolver.resolve_hashes(self.results) | ||
| for ireq, ireq_hashes in resolved_hashes.items(): | ||
| if ireq not in self.hashes: | ||
| self.hashes[ireq] = ireq_hashes | ||
| if _should_include_hash(ireq): |
There was a problem hiding this comment.
Ah that's right, this works too as an approach, but I actually meant to come back to this because I have some dictionary merging code I implemented in requirementslib which I have plans to use to merge the development lockfile section with the default one:
I was planning to use the same approach to merge in the hashes from here, but I think we can hold off on that for now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: frostming mianghong@gmail.com
The issue
The fix of #3147 is reverted in later commits(#3158).
The fix
Make sure the hash of artifacts are included in lockfile
Fixes #3212
The checklist
news/directory to describe this fix with the extension.bugfix,.feature,.behavior,.doc..vendor. or.trivial(this will appear in the release changelog). Use semantic line breaks and name the file after the issue number or the PR #.