[arvados] updated: 2.7.0-5821-g1422c23223

[git repository hosting]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base | 2 +-
 tools/arvbox/lib/arvbox/docker/yml_override.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  1422c2322339ac5cabdc15f8917d56f6ab501834 (commit)
       via  9470b63ded5f118583f312b7c45f7a6b2c673ad3 (commit)
      from  83ed86d4d016d345cdadf2b33d140a5c5af59938 (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 1422c2322339ac5cabdc15f8917d56f6ab501834
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Jan 15 10:48:23 2024 -0500

    21230: Fix typo
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index a235274d31..d8b2408831 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -98,7 +98,7 @@ RUN $GOPATH/bin/arvados-server install -type test
 # also rely on it.
 # 1. Install wheel just to modernize the virtualenv.
 # 2. Install setuptools as an sdk build dependency; PyYAML for all tests
-#    and yml_override;py; and pdoc for the doc service.
+#    and yml_override.py; and pdoc for the doc service.
 # Everything else is installed by the sdk service on boot.
 RUN python3 -m venv /opt/arvados-py \
  && /opt/arvados-py/bin/pip install --no-cache-dir wheel \

commit 9470b63ded5f118583f312b7c45f7a6b2c673ad3
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Jan 15 10:23:54 2024 -0500

    21230: Update yml_override.py for PyYAML 6.0+
    
    This tool gets called to update configuration files for other Arvados
    services, so we're not expecting it to deal with any Python objects.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/yml_override.py b/tools/arvbox/lib/arvbox/docker/yml_override.py
index deea83f909..5f9ee68e4f 100755
--- a/tools/arvbox/lib/arvbox/docker/yml_override.py
+++ b/tools/arvbox/lib/arvbox/docker/yml_override.py
@@ -10,12 +10,12 @@ fn = sys.argv[1]
 
 try:
     with open(fn+".override") as f:
-        b = yaml.load(f)
+        b = yaml.safe_load(f)
 except IOError:
     exit()
 
 with open(fn) as f:
-    a = yaml.load(f)
+    a = yaml.safe_load(f)
 
 def recursiveMerge(a, b):
     if isinstance(a, dict) and isinstance(b, dict):
@@ -27,4 +27,4 @@ def recursiveMerge(a, b):
         return b
 
 with open(fn, "w") as f:
-    yaml.dump(recursiveMerge(a, b), f)
+    yaml.safe_dump(recursiveMerge(a, b), f)

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


hooks/post-receive
--