-
-
Notifications
You must be signed in to change notification settings - Fork 233
ArraySchema.items does need typeDSL after all #1515
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
base: main
Are you sure you want to change the base?
Conversation
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 ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ 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 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
36cf29d
to
2ee49d2
Compare
@tetron I think I was too tired when I tested this before; here is a simpler example!