Avoid removing step cwlVersion

rabix · Mar 16, 2022 · 09ac9f3 · 09ac9f3
1 parent c322e5e
commit 09ac9f3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -1 +1 @@
-__version__ = "2022.03.10"
+__version__ = "2022.03.16"
diff --git 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
@@ -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
@@ -54,6 +54,7 @@
             ],
             "run": {
                 "class": "CommandLineTool",
+                "cwlVersion": "v1.0",
                 "requirements": [],
                 "inputs": [
                     {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "2022.03.10"
		__version__ = "2022.03.16"