-
-
Notifications
You must be signed in to change notification settings - Fork 231
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
ArraySchema.items does need typeDSL after all #1515
Draft
mr-c
wants to merge
2
commits into
main
Choose a base branch
from
arrayschema_typedsl_needed
base: main
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.
Draft
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
Here is the log from running the rests without the fix: [gw0] linux -- Python 3.9.7 /home/michael/cwltool/env3.9/bin/python3
version = '1_0'
@pytest.mark.parametrize("version", ["1_0", "1_1", "1_2"])
def test_array_items_typedsl(version) -> None:
"""Demonstrate that 'type: array, items: SomeType[]' works."""
err_code, _, stderr = get_main_output(
[
get_data(f"tests/wf/nested_typedsl_v{version}.cwl"),
get_data("tests/wf/nested_typedsl_job.yml"),
]
)
> assert err_code == 0
E assert 1 == 0
E +1
E -0
tests/test_examples.py:1601: AssertionError
----------------------------------------------------------------------------- Captured log call -----------------------------------------------------------------------------
INFO cwltool:main.py:973 3.1.20210906152048
INFO cwltool:load_tool.py:101 Resolved '/home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl' to 'file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl'
ERROR cwltool:main.py:1142 Tool definition failed validation:
tests/wf/nested_typedsl_v1_0.cwl:5:1: checking field `inputs`
tests/wf/nested_typedsl_v1_0.cwl:6:3: checking object `tests/wf/nested_typedsl_v1_0.cwl#cat_in`
tests/wf/nested_typedsl_v1_0.cwl:7:5: Field `items` references unknown identifier `File[]`,
tried
file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl#File[]
checking field `type`
tests/wf/nested_typedsl_v1_0.cwl:9:7: Field `items` references unknown identifier `File[]`,
tried
file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl#File[]
_______________________________________________________________________ test_array_items_typedsl[1_2] _______________________________________________________________________
[gw2] linux -- Python 3.9.7 /home/michael/cwltool/env3.9/bin/python3
version = '1_2'
@pytest.mark.parametrize("version", ["1_0", "1_1", "1_2"])
def test_array_items_typedsl(version) -> None:
"""Demonstrate that 'type: array, items: SomeType[]' works."""
err_code, _, stderr = get_main_output(
[
get_data(f"tests/wf/nested_typedsl_v{version}.cwl"),
get_data("tests/wf/nested_typedsl_job.yml"),
]
)
> assert err_code == 0
E assert 1 == 0
E +1
E -0
tests/test_examples.py:1601: AssertionError
----------------------------------------------------------------------------- Captured log call -----------------------------------------------------------------------------
INFO cwltool:main.py:973 3.1.20210906152048
INFO cwltool:load_tool.py:101 Resolved '/home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl' to 'file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl'
ERROR cwltool:main.py:1142 Tool definition failed validation:
tests/wf/nested_typedsl_v1_2.cwl:5:1: checking field `inputs`
tests/wf/nested_typedsl_v1_2.cwl:6:3: checking object `tests/wf/nested_typedsl_v1_2.cwl#cat_in`
tests/wf/nested_typedsl_v1_2.cwl:7:5: Field `items` references unknown identifier `File[]`,
tried
file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl#File[]
checking field `type`
tests/wf/nested_typedsl_v1_2.cwl:9:7: Field `items` references unknown identifier `File[]`,
tried
file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl#File[]
_______________________________________________________________________ test_array_items_typedsl[1_1] _______________________________________________________________________
[gw1] linux -- Python 3.9.7 /home/michael/cwltool/env3.9/bin/python3
version = '1_1'
@pytest.mark.parametrize("version", ["1_0", "1_1", "1_2"])
def test_array_items_typedsl(version) -> None:
"""Demonstrate that 'type: array, items: SomeType[]' works."""
err_code, _, stderr = get_main_output(
[
get_data(f"tests/wf/nested_typedsl_v{version}.cwl"),
get_data("tests/wf/nested_typedsl_job.yml"),
]
)
> assert err_code == 0
E assert 1 == 0
E +1
E -0
tests/test_examples.py:1601: AssertionError
----------------------------------------------------------------------------- Captured log call -----------------------------------------------------------------------------
INFO cwltool:main.py:973 3.1.20210906152048
INFO cwltool:load_tool.py:101 Resolved '/home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl' to 'file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl'
ERROR cwltool:main.py:1142 Tool definition failed validation:
tests/wf/nested_typedsl_v1_1.cwl:5:1: checking field `inputs`
tests/wf/nested_typedsl_v1_1.cwl:6:3: checking object `tests/wf/nested_typedsl_v1_1.cwl#cat_in`
tests/wf/nested_typedsl_v1_1.cwl:7:5: Field `items` references unknown identifier `File[]`,
tried
file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl#File[]
checking field `type`
tests/wf/nested_typedsl_v1_1.cwl:9:7: Field `items` references unknown identifier `File[]`,
tried
file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl#File[] |
ba39d22
to
36cf29d
Compare
Codecov Report
@@ Coverage Diff @@
## main #1515 +/- ##
===========================================
- Coverage 66.45% 55.46% -11.00%
===========================================
Files 93 47 -46
Lines 16541 8294 -8247
Branches 4390 2160 -2230
===========================================
- Hits 10992 4600 -6392
+ Misses 4401 3147 -1254
+ Partials 1148 547 -601 Continue to review full report at Codecov.
|
36cf29d
to
2ee49d2
Compare
Open
70 tasks
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.
@tetron I think I was too tired when I tested this before; here is a simpler example!