cpg-utils 5.4.0__tar.gz → 5.4.2__tar.gz

{cpg_utils-5.4.0 → cpg_utils-5.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpg-utils
-Version: 5.4.0
+Version: 5.4.2
 Summary: Library of convenience functions specific to the CPG
 Home-page: https://github.com/populationgenomics/cpg-utils
 License: MIT

{cpg_utils-5.4.0 → cpg_utils-5.4.2}/cpg_utils/cloud.py

@@ -155,7 +155,7 @@ def _ensure_image_tags_loaded(project: str, location: str, repository: str) -> N
             image_tags[name][tag] = DockerImage(
                 image.name,
                 image.uri,
-                f'{base_uri}@{tag}',
+                f'{base_uri}:{tag}',
                 image.image_size_bytes,
                 image.build_time,
             )

{cpg_utils-5.4.0 → cpg_utils-5.4.2}/cpg_utils/hail_batch.py

@@ -189,12 +189,16 @@ class Batch(hb.Batch):
 
         self.total_job_num += 1
 
+        # Multiple jobs in the batch might reference the same attributes dict
+        # object. Avoid modifying the dict object (e.g. with pop() or update())
+        # to avoid changing the attributes of subsequently processed jobs.
+
         attributes = attributes or {}
         stage = attributes.get('stage')
         dataset = attributes.get('dataset')
         sequencing_group = attributes.get('sequencing_group')
         participant_id = attributes.get('participant_id')
-        sequencing_groups: set[str] = set(attributes.pop('sequencing_groups', []) or [])
+        sequencing_groups: set[str] = set(attributes.get('sequencing_groups') or [])
         if sequencing_group:
             sequencing_groups.add(sequencing_group)
         part = attributes.get('part')
@@ -234,10 +238,14 @@ class Batch(hb.Batch):
         self.job_by_tool[tool]['job_n'] += 1
         self.job_by_tool[tool]['sequencing_groups'] |= sequencing_groups
 
+        # Ensure all the returned attribute values are presented as strings
+        fixed_attrs = {
+            k: str(v) for k, v in attributes.items() if k != 'sequencing_groups'
+        }
+
         seqgroups_str = str(sorted(sequencing_groups))
-        attributes.update(self._pack_attribute('sequencing_groups', seqgroups_str))
+        fixed_attrs.update(self._pack_attribute('sequencing_groups', seqgroups_str))
 
-        fixed_attrs = {k: str(v) for k, v in attributes.items()}
         return name, fixed_attrs
 
     def run(self, **kwargs: Any):

{cpg_utils-5.4.0 → cpg_utils-5.4.2}/cpg_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpg-utils
-Version: 5.4.0
+Version: 5.4.2
 Summary: Library of convenience functions specific to the CPG
 Home-page: https://github.com/populationgenomics/cpg-utils
 License: MIT

{cpg_utils-5.4.0 → cpg_utils-5.4.2}/setup.py

@@ -8,7 +8,7 @@ with open('README.md') as f:
 setup(
     name='cpg-utils',
     # This tag is automatically updated by bumpversion
-    version='5.4.0',
+    version='5.4.2',
     description='Library of convenience functions specific to the CPG',
     long_description=long_description,
     long_description_content_type='text/markdown',