scandeps should not apply mergedirs at every level #1615
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
When getting back a list of dependencies, and using "nestdirs", in the specific case it there are references to both a directory and files within that directory, it may report multiple dependencies for the same directory. The mergedir method merges those references into one.
Codecov Report
@@ Coverage Diff @@
## main #1615 +/- ##
==========================================
+ Coverage 66.62% 66.70% +0.08%
==========================================
Files 93 93
Lines 16607 16583 -24
Branches 4402 4398 -4
==========================================
- Hits 11064 11062 -2
+ Misses 4402 4383 -19
+ Partials 1141 1138 -3
Continue to review full report at Codecov.
|
|
This pull request introduces 1 alert when merging 2e7013f into 7cef4dd - view on LGTM.com new alerts:
|
mr-c
requested changes
Feb 10, 2022
|
This pull request introduces 1 alert when merging 9f59f5e into 7cef4dd - view on LGTM.com new alerts:
|
mr-c
approved these changes
Feb 10, 2022
mr-c
requested changes
Feb 10, 2022
cwltool/process.py
Outdated
Comment on lines
1127
to
1130
| elif e["location"] != ents[basename]["location"]: | ||
| raise Exception( | ||
| "Conflict between %s and %s", e["location"], ents[basename]["location"] | ||
| ) |
There was a problem hiding this comment.
Can we get a test to confirm the conflict detection as well?
|
This pull request introduces 1 alert when merging f8a5d4c into 7cef4dd - view on LGTM.com new alerts:
|
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.
When getting back a list of dependencies, and using "nestdirs", in the
specific case it there are references to both a directory and files
within that directory, it may report multiple dependencies for the
same directory. The mergedir method merges those references into one.