From 09ac9f322de7cfcb5c9ec663ebd96fbd7a93db30 Mon Sep 17 00:00:00 2001 From: bogdang989 Date: Wed, 16 Mar 2022 15:13:40 +0100 Subject: [PATCH] Avoid removing step cwlVersion Avoid removing step cwlVersion --- sbpack/pack.py | 1 - sbpack/version.py | 2 +- tests/test_localpack.py | 1 + tests/workflows/wf6.json | 1 + tests/workflows/wf6_with_ids.json | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sbpack/pack.py b/sbpack/pack.py index 4c59b74..90b6937 100644 --- a/sbpack/pack.py +++ b/sbpack/pack.py @@ -247,7 +247,6 @@ def resolve_steps( if this_version > parent_version: cwl["cwlVersion"] = v["run"]["cwlVersion"] # not really enough, but hope for the best - del v["run"]["cwlVersion"] return cwl diff --git a/sbpack/version.py b/sbpack/version.py index 42eb2cf..02edab5 100644 --- a/sbpack/version.py +++ b/sbpack/version.py @@ -1 +1 @@ -__version__ = "2022.03.10" +__version__ = "2022.03.16" diff --git a/tests/test_localpack.py b/tests/test_localpack.py index dfaa6f6..3a0784c 100644 --- a/tests/test_localpack.py +++ b/tests/test_localpack.py @@ -4,6 +4,7 @@ from sbpack.schemadef import _inline_type from pytest import CaptureFixture + def test_json_output(capsys: CaptureFixture[str]) -> None: _inline_type.type_name_uniq_id = 0 _inline_type.type_names = set() diff --git a/tests/workflows/wf6.json b/tests/workflows/wf6.json index 224733c..69fd664 100644 --- a/tests/workflows/wf6.json +++ b/tests/workflows/wf6.json @@ -54,6 +54,7 @@ ], "run": { "class": "CommandLineTool", + "cwlVersion": "v1.0", "requirements": [], "inputs": [ { diff --git a/tests/workflows/wf6_with_ids.json b/tests/workflows/wf6_with_ids.json index 3dfa003..1590ad4 100644 --- a/tests/workflows/wf6_with_ids.json +++ b/tests/workflows/wf6_with_ids.json @@ -54,6 +54,7 @@ ], "run": { "class": "CommandLineTool", + "cwlVersion": "v1.0", "requirements": [], "inputs": [ {