module-qc-tools 2.4.2rc0__tar.gz → 2.4.2rc2__tar.gz

{module_qc_tools-2.4.2rc0 → module_qc_tools-2.4.2rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: module_qc_tools
-Version: 2.4.2rc0
+Version: 2.4.2rc2
 Summary: Module qc tools
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools
 Project-URL: Bug Tracker, https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/issues
@@ -46,7 +46,7 @@ Requires-Dist: typer>=0.9.0
 Requires-Dist: urllib3<2,>=1.26.20; 'el7.x86_64' in platform_release
 Description-Content-Type: text/markdown
 
-# module-qc-tools v2.4.2rc0
+# module-qc-tools v2.4.2rc2
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

{module_qc_tools-2.4.2rc0 → module_qc_tools-2.4.2rc2}/README.md

@@ -1,4 +1,4 @@
-# module-qc-tools v2.4.2rc0
+# module-qc-tools v2.4.2rc2
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

{module_qc_tools-2.4.2rc0 → module_qc_tools-2.4.2rc2}/docs/install.md

@@ -92,7 +92,7 @@ package.
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install -U pip
-$ python -m pip install -U pip module-qc-tools==2.4.2rc0
+$ python -m pip install -U pip module-qc-tools==2.4.2rc2
 ```
 
 ### via uv
@@ -101,7 +101,7 @@ $ python -m pip install -U pip module-qc-tools==2.4.2rc0
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install uv
-$ uv pip install module-qc-tools==2.4.2rc0
+$ uv pip install module-qc-tools==2.4.2rc2
 ```
 
 # Usage

{module_qc_tools-2.4.2rc0 → module_qc_tools-2.4.2rc2}/src/module_qc_tools/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.4.2rc0'
-__version_tuple__ = version_tuple = (2, 4, 2, 'rc0')
+__version__ = version = '2.4.2rc2'
+__version_tuple__ = version_tuple = (2, 4, 2, 'rc2')

{module_qc_tools-2.4.2rc0 → module_qc_tools-2.4.2rc2}/src/module_qc_tools/cli/yarr.py

@@ -67,12 +67,12 @@ SCANS_TUN_L1_L2 = [
 ]
 
 SCANS_TUN_CORE = {
-    ("rd53b", "L0"): SCANS_TUN_L0,
-    ("rd53b", "L1"): SCANS_TUN_L1_L2,
-    ("rd53b", "L2"): SCANS_TUN_L1_L2,
-    ("itkpixv2", "L0"): SCANS_TUN_L0_TOT + SCANS_TUN_L0,
-    ("itkpixv2", "L1"): SCANS_TUN_L1_L2_TOT + SCANS_TUN_L1_L2,
-    ("itkpixv2", "L2"): SCANS_TUN_L1_L2_TOT + SCANS_TUN_L1_L2,
+    ("RD53B", "L0"): SCANS_TUN_L0,
+    ("RD53B", "L1"): SCANS_TUN_L1_L2,
+    ("RD53B", "L2"): SCANS_TUN_L1_L2,
+    ("ITKPIXV2", "L0"): SCANS_TUN_L0_TOT + SCANS_TUN_L0,
+    ("ITKPIXV2", "L1"): SCANS_TUN_L1_L2_TOT + SCANS_TUN_L1_L2,
+    ("ITKPIXV2", "L2"): SCANS_TUN_L1_L2_TOT + SCANS_TUN_L1_L2,
 }
 
 SCANS_PFA = [
@@ -179,7 +179,7 @@ def main(
         # update the scan name to inject the prefix needed
         scan_opts = shlex.split(scan)
         scan_path = str(
-            yr.run_dir / "configs" / "scans" / chip_type.lower() / scan_opts.pop()
+            yr.run_dir / "configs" / "scans" / chip_type.lower() / scan_opts.pop(0)
         )
 
         yr.run_scan(

{module_qc_tools-2.4.2rc0 → module_qc_tools-2.4.2rc2}/src/module_qc_tools/utils/yarr.py

@@ -165,7 +165,8 @@ class yarr(hardware_control_base):
 
     def run_scan(self, scan, output=None, skip_reset=False, tags: list | None = None):
         tags = tags or []
-        tag_str = f"-W {json.dumps(tags)}" if tags else ""
+        # this escaping needed due to https://gitlab.cern.ch/YARR/YARR/-/issues/338
+        tag_str = (f"-W '{json.dumps(tags)}'" if tags else "").replace('"', '\\"')
         output = f"-o {output}" if output else ""
         cmd = f'{self.scanConsole_exe} -r {self.controller} -c {self.connectivity} -s {scan} {tag_str} {output} {"--skip-reset" if skip_reset else ""} {self.exe_postOpts}'
 

{module_qc_tools-2.4.2rc0 → module_qc_tools-2.4.2rc2}/tbump.toml

@@ -1,5 +1,5 @@
 [version]
-current = "2.4.2rc0"
+current = "2.4.2rc2"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before
@@ -17,7 +17,7 @@ regex = '''
 
 [git]
 # The current version will get updated when tbump is run
-message_template = "Bump version: 2.4.2rc0 → {new_version}"
+message_template = "Bump version: 2.4.2rc2 → {new_version}"
 tag_template = "v{new_version}"
 
 # For each file to patch, add a [[file]] config