Refactor and cleannup some cruft code around no_deps flag. #5164
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
2 tasks
matteius
commented
Jul 6, 2022
| @@ -1459,7 +1457,7 @@ def pip_install( | |||
| r=None, | |||
| allow_global=False, | |||
| ignore_hashes=False, | |||
| no_deps=None, | |||
There was a problem hiding this comment.
Nothing that calls this ever passed anything other than True/False and the default behavior is False -- meaning install all dependencies. Skipping dependency installs is the special case of True being passed.
matteius
commented
Jul 6, 2022
| @@ -720,7 +720,6 @@ def batch_install( | |||
| if sequential_deps is None: | |||
| sequential_deps = [] | |||
| failed = not retry | |||
| install_deps = not no_deps | |||
There was a problem hiding this comment.
Essentially moving this to line 759 is what the original PR did that this replaces -- the reason why is because line 757 can override this for a specific artifact, but we should not use that flag for all iterations of the loop.
matteius
commented
Jul 6, 2022
| @@ -1503,14 +1501,6 @@ def pip_install( | |||
| extra_indexes = list(project.sources) | |||
| if requirement and requirement.vcs or requirement.editable: | |||
| requirement.index = None | |||
| # Install dependencies when a package is a non-editable VCS dependency. | |||
| # Don't specify a source directory when using --system. | |||
| if not requirement.editable and no_deps is not True: | |||
There was a problem hiding this comment.
The comment indicated this first block was due to really really old Pipfile.lock and no tests fail around this.
matteius
commented
Jul 6, 2022
| # Leave this off because old Pipfile.lock don't have all deps included | ||
| # TODO: When can it be turned back on? | ||
| no_deps = False | ||
| elif requirement.editable and no_deps is None: |
There was a problem hiding this comment.
no_deps was never actually None.
oz123
approved these changes
Jul 7, 2022
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.
The issue
Replacement PR for really old PR: #3985
The fix
Cleans up some impossible code paths and a logical bug where a flag gets overwritten once in a loop and then retries are caused.
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 #.