-
Notifications
You must be signed in to change notification settings - Fork 44
Element dependencies: Improve inline documentation to make it clear that deps of _Scope.BUILD don't return self #2173
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
Open
nathanwilliams-ct
wants to merge
1
commit into
apache:master
Choose a base branch
from
nathanwilliams-ct:patch-1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+7
−7
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -72,7 +72,7 @@ | |||||
| from itertools import chain | ||||||
| import string | ||||||
| from threading import Lock | ||||||
| from typing import cast, TYPE_CHECKING, Dict, Iterator, Iterable, List, Optional, Set, Sequence | ||||||
| from typing import cast, TYPE_CHECKING, Dict, Iterator, Iterable, List, Optional, Set, Sequence, Generator | ||||||
|
|
||||||
| from pyroaring import BitMap # pylint: disable=no-name-in-module | ||||||
|
|
||||||
|
|
@@ -883,8 +883,8 @@ def _dependencies(self, scope: _Scope, *, recurse=True, visited=None): | |||||
| yield dep | ||||||
| else: | ||||||
|
|
||||||
| def visit(element, scope, visited): | ||||||
| if scope == _Scope.ALL: | ||||||
| def visit(element: Element, scope: _Scope, visited: tuple[BitMap,BitMap]) -> Generator[Element]: | ||||||
| if scope == _Scope.ALL: # The element, it's runtime and build dependencies | ||||||
| visited[0].add(element._unique_id) | ||||||
| visited[1].add(element._unique_id) | ||||||
|
|
||||||
|
|
@@ -893,22 +893,22 @@ def visit(element, scope, visited): | |||||
| yield from visit(dep, _Scope.ALL, visited) | ||||||
|
|
||||||
| yield element | ||||||
| elif scope == _Scope.BUILD: | ||||||
| elif scope == _Scope.BUILD: # The element's build dependencies only | ||||||
| visited[0].add(element._unique_id) | ||||||
|
|
||||||
| for dep in element.__build_dependencies: | ||||||
| if dep._unique_id not in visited[1]: | ||||||
| yield from visit(dep, _Scope.RUN, visited) | ||||||
|
|
||||||
| elif scope == _Scope.RUN: | ||||||
| # _Scope.BUILD intentionally excludes yielding the element itself. | ||||||
| elif scope == _Scope.RUN: # The element and it's runtime dependencies | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| visited[1].add(element._unique_id) | ||||||
|
nathanwilliams-ct marked this conversation as resolved.
|
||||||
|
|
||||||
| for dep in element.__runtime_dependencies: | ||||||
| if dep._unique_id not in visited[1]: | ||||||
| yield from visit(dep, _Scope.RUN, visited) | ||||||
|
|
||||||
| yield element | ||||||
| else: | ||||||
| else: # _Scope.NONE: Only the element | ||||||
| yield element | ||||||
|
|
||||||
| if visited is None: | ||||||
|
|
||||||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.