[ARVADOS] updated: 2.1.0-1764-g8c9c451ce

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py     | 2 +-
 sdk/cwl/arvados_cwl/arvcontainer.py | 2 +-
 sdk/cwl/tests/test_container.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  8c9c451ce03f5af75719064db4442eba74c51120 (commit)
       via  0c53ada0b541823dea1cec479d4cd5dbd7abce5b (commit)
      from  bed472363447f572f9664ff8b3d5a056fc87ec4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8c9c451ce03f5af75719064db4442eba74c51120
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Jan 5 15:05:25 2022 -0500

    18323: Fix test
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index e97572cd9..fb43c1013 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -1063,7 +1063,7 @@ class TestContainer(unittest.TestCase):
             "class": "CommandLineTool",
             "hints": [
             {
-                "class": "http://arvados.org/cwl#CUDARequirement",
+                "class": "http://commonwl.org/cwltool#CUDARequirement",
                 "minCUDADriverVersion": "11.0",
                 "minCUDAHardwareCapability": "9.0",
             }

commit 0c53ada0b541823dea1cec479d4cd5dbd7abce5b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Jan 5 15:03:30 2022 -0500

    18323: Fix to use cwltool:CUDARequirement
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index df5866d67..c3848b262 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -251,7 +251,7 @@ def add_arv_hints():
         "http://arvados.org/cwl#ClusterTarget",
         "http://arvados.org/cwl#OutputStorageClass",
         "http://arvados.org/cwl#ProcessProperties",
-        "http://arvados.org/cwl#CUDARequirement"
+        "http://commonwl.org/cwltool#CUDARequirement"
     ])
 
 def exit_signal_handler(sigcode, frame):
diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 979b102cb..3c7e9cfaa 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -291,7 +291,7 @@ class ArvadosContainer(JobBase):
             else:
                 container_request["output_storage_classes"] = runtimeContext.intermediate_storage_classes.strip().split(",")
 
-        cuda_req, _ = self.get_requirement("http://arvados.org/cwl#CUDARequirement")
+        cuda_req, _ = self.get_requirement("http://commonwl.org/cwltool#CUDARequirement")
         if cuda_req:
             runtime_constraints["cuda"] = {
                 "device_count": cuda_req.get("deviceCountMin", 1),

-----------------------------------------------------------------------


hooks/post-receive
--