[arvados] updated: 2.6.0-198-g499aaaa77

[git repository hosting]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py   | 7 +++++++
 sdk/cwl/arvados_cwl/pathmapper.py | 4 ++--
 sdk/cwl/setup.py                  | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

       via  499aaaa774fc2b52057032456db5256c39b5b8ec (commit)
       via  bde9fcda5db8a822450bb524cb9ef5b6839bfbb9 (commit)
      from  72b8fdfb21636030f2e110eb5850beb5f08bb930 (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 499aaaa774fc2b52057032456db5256c39b5b8ec
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jun 2 11:21:35 2023 -0400

    20531: Bump cwltool and schema-salad versions
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 9af61a3d9..92f0952af 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -36,8 +36,8 @@ setup(name='arvados-cwl-runner',
       # file to determine what version of cwltool and schema-salad to
       # build.
       install_requires=[
-          'cwltool==3.1.20230127121939',
-          'schema-salad==8.4.20230127112827',
+          'cwltool==3.1.20230601100705',
+          'schema-salad==8.4.20230601112322',
           'arvados-python-client{}'.format(pysdk_dep),
           'ciso8601 >= 2.0.0',
           'networkx < 2.6',

commit bde9fcda5db8a822450bb524cb9ef5b6839bfbb9
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jun 2 11:19:25 2023 -0400

    20531: Suppress googleapiclient retry warning, better download error
    
    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 472243397..6a8e320c6 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -377,10 +377,17 @@ def main(args=sys.argv[1:],
     logger.setLevel(logging.INFO)
     logging.getLogger('arvados').setLevel(logging.INFO)
     logging.getLogger('arvados.keep').setLevel(logging.WARNING)
+    # API retries are at WARNING level and can be noisy, but as long as
+    # they succeed we don't need to see warnings about it.
+    logging.getLogger('googleapiclient').setLevel(logging.ERROR)
 
     if arvargs.debug:
         logger.setLevel(logging.DEBUG)
         logging.getLogger('arvados').setLevel(logging.DEBUG)
+        # In debug mode show logs about retries, but we arn't
+        # debugging the google client so we don't need to see
+        # everything.
+        logging.getLogger('googleapiclient').setLevel(logging.WARNING)
 
     if arvargs.quiet:
         logger.setLevel(logging.WARN)
diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py
index 3f54a396b..539188fdd 100644
--- a/sdk/cwl/arvados_cwl/pathmapper.py
+++ b/sdk/cwl/arvados_cwl/pathmapper.py
@@ -115,7 +115,7 @@ class ArvPathMapper(PathMapper):
                         logger.info("%s is %s", src, keepref)
                         self._pathmap[src] = MapperEnt(keepref, keepref, srcobj["class"], True)
                 except Exception as e:
-                    logger.warning(str(e))
+                    logger.warning("Download error: %s", e)
             else:
                 self._pathmap[src] = MapperEnt(src, src, srcobj["class"], True)
 
@@ -147,7 +147,7 @@ class ArvPathMapper(PathMapper):
             for opt in self.optional_deps:
                 if obj["location"] == opt["location"]:
                     return
-            raise SourceLine(obj, "location", WorkflowException).makeError("Don't know what to do with '%s'" % obj["location"])
+            raise SourceLine(obj, "location", WorkflowException).makeError("Can't handle '%s'" % obj["location"])
 
     def needs_new_collection(self, srcobj, prefix=""):
         """Check if files need to be staged into a new collection.

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


hooks/post-receive
--