module-qc-tools 2.7.0__tar.gz → 2.7.1__tar.gz

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/.gitlab-ci.yml

@@ -186,7 +186,7 @@ deploy_docs_latest:
   script:
     # the next three lines are just to commit and push pages to the project
     - git config --global user.email
-      "project_139533_bot_52a0e9bbb1570326242e61cb6cd9d917@noreply.gitlab.cern.ch"
+      "project_139533_bot_86cd7491df432274ff6bb3decacac29d@noreply.gitlab.cern.ch"
     - git config --global user.name "pre-commit-ci"
     - git remote set-url origin
       "https://__pre-commit_ci_token:${PRE_COMMIT_CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/${CI_PROJECT_PATH}.git"

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/.zenodo.json

@@ -1,8 +1,8 @@
 {
     "description": " general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests for the ATLAS ITk project",
     "license": "MIT",
-    "title": "atlas-itk-pixel-modules/mqt: v2.7.0",
-    "version": "v2.7.0",
+    "title": "atlas-itk-pixel-modules/mqt: v2.7.1",
+    "version": "v2.7.1",
     "upload_type": "software",
     "creators": [
     {
@@ -120,7 +120,7 @@
     "related_identifiers": [
         {
             "scheme": "url",
-            "identifier": "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tree/v2.7.0",
+            "identifier": "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tree/v2.7.1",
             "relation": "isSupplementTo"
         }
     ]

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/CITATION.cff

@@ -77,6 +77,6 @@ keywords:
 license:
 - mit
 message: If you use this software, please cite it using the metadata from this file.
-title: 'atlas-itk-pixel-modules/mqt: v2.7.0'
+title: 'atlas-itk-pixel-modules/mqt: v2.7.1'
 type: software
-version: v2.7.0
+version: v2.7.1

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: module_qc_tools
-Version: 2.7.0
+Version: 2.7.1
 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
@@ -45,7 +45,7 @@ Requires-Dist: typer>=0.18.0
 Requires-Dist: urllib3<2,>=1.26.20; 'el7.x86_64' in platform_release
 Description-Content-Type: text/markdown
 
-# module-qc-tools v2.7.0
+# module-qc-tools v2.7.1
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/README.md

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

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/docs/history.md

@@ -36,8 +36,6 @@ and this project adheres to
     `mqt measurement sldo -c <hw config> -o <output dir> --npoints <int>`
   - a pipeline test `test_measurement_one_point_SLDO` was also added in
     `test_emulator.py` to check the implementation
-  - add fcntl capability to lock before calling yarr commands simultaneously
-    (!265)
 
 **_Fixed:_**
 

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/docs/install.md

@@ -94,7 +94,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.7.0
+$ python -m pip install -U pip module-qc-tools==2.7.1
 ```
 
 ### via uv
@@ -103,7 +103,7 @@ $ python -m pip install -U pip module-qc-tools==2.7.0
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install uv
-$ uv pip install module-qc-tools==2.7.0
+$ uv pip install module-qc-tools==2.7.1
 ```
 
 # Usage

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/src/module_qc_tools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.7.0'
-__version_tuple__ = version_tuple = (2, 7, 0)
+__version__ = version = '2.7.1'
+__version_tuple__ = version_tuple = (2, 7, 1)
 
 __commit_id__ = commit_id = None

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/src/module_qc_tools/utils/yarr.py

@@ -11,7 +11,6 @@ from pathlib import Path
 
 from module_qc_data_tools.utils import get_chip_type_from_config
 
-from module_qc_tools.utils.file_lock import yarr_file_lock
 from module_qc_tools.utils.hardware_control_base import hardware_control_base
 
 # if sys.version_info >= (3, 9):
@@ -79,121 +78,6 @@ class yarr(hardware_control_base):
     def running_emulator(self):
         return self.emulator
 
-    def _get_yarr_lock_path(self):
-        """Get the YARR lock file path for this instance."""
-        lock_path = Path("/tmp/mqt.lock")
-        # Create the lock file if it doesn't exist
-        lock_path.touch(exist_ok=True)
-        return str(lock_path)
-
-    def _execute_with_lock(self, func, *args, **kwargs):
-        """Execute a function with file locking if not using emulator."""
-        if self.emulator:
-            return func(*args, **kwargs)
-
-        lock_path = self._get_yarr_lock_path()
-        logger.debug(f"Using file lock for YARR command on {lock_path}")
-
-        try:
-            with yarr_file_lock(lock_path=lock_path, show_status=True):
-                return func(*args, **kwargs)
-        except (FileNotFoundError, PermissionError) as e:
-            logger.warning(
-                f"Could not acquire YARR lock on {lock_path}: {e}. Proceeding without lock."
-            )
-            return func(*args, **kwargs)
-        except TimeoutError as e:
-            logger.error(f"Timeout waiting for YARR lock: {e}")
-            raise
-
-    def send_command(
-        self,
-        cmd,
-        purpose="send command",
-        extra_error_messages=None,
-        pause=0,
-        success_code=0,
-    ):
-        """Send command with file locking for yarr executables."""
-
-        def _send_command_impl():
-            extra_error_messages_local = extra_error_messages or []
-            logger.debug("Sending command: ")
-            logger.debug(cmd)
-            result = self.run(
-                cmd, shell=True, capture_output=True, check=False, cwd=self.run_dir
-            )
-            if result.stdout:
-                logger.debug(result.stdout.decode("utf-8"))
-
-            if result.stderr:
-                logger.error(result.stderr.decode("utf-8"))
-
-            if result.returncode != success_code:
-                for extra_error_message in extra_error_messages_local:
-                    logger.info(f"[{self._name}] {extra_error_message}")
-                msg = f"[{self._name}] fail to {purpose}!! Return code {result.returncode}"
-                raise RuntimeError(msg)
-            logger.debug(f"[{self._name}] Finished {purpose}")
-
-            time.sleep(pause)
-            return result.returncode
-
-        return self._execute_with_lock(_send_command_impl)
-
-    def send_command_and_read(
-        self,
-        cmd,
-        dtype=float,
-        purpose="send command and read",
-        unit="",
-        extra_error_messages=None,
-        max_nTry=0,
-        success_code=0,
-    ):
-        """Send command and read response with file locking for yarr executables."""
-
-        def _send_command_and_read_impl():
-            extra_error_messages_local = extra_error_messages or []
-            logger.debug("Sending command: ")
-            logger.debug(cmd)
-            result = self.run(
-                cmd, shell=True, capture_output=True, check=False, cwd=self.run_dir
-            )
-
-            logger.debug(result.stdout.decode())
-
-            # A while loop to retry communications in case of timeout error.
-            nTry = 0
-            while result.returncode != success_code and nTry < max_nTry:
-                nTry += 1
-                for extra_error_message in extra_error_messages_local:
-                    logger.info(f"[{self._name}] {extra_error_message}")
-                logger.info(f"Try again. Send command and read attempt {nTry} time(s).")
-                logger.debug("Sending command: ")
-                logger.debug(cmd)
-                result = self.run(
-                    cmd, shell=True, capture_output=True, check=False, cwd=self.run_dir
-                )
-                logger.debug(result.stdout.decode())
-
-            if result.returncode != success_code:
-                msg = f"[{self._name}] fail to {purpose}!! Exit with returncode {result.returncode}.\nstdout:\n {result.stdout.decode()}\nstderr: {result.stderr.decode()}"
-                raise RuntimeError(msg)
-            try:
-                value = dtype(result.stdout.decode())
-            except Exception:
-                logger.debug(
-                    "Failed to return type of decoded send command, will return un-typed result (this happens for read-register)"
-                )
-                value = result.stdout.decode()
-            for _extra_error_message in extra_error_messages_local:
-                logger.info(f"[{self._name}] {purpose}: {value}{unit}")
-
-            return value, result.returncode
-
-        return self._execute_with_lock(_send_command_and_read_impl)
-
     def configure(self, skip_reset=False, connectivity=None):
         connectivity = connectivity or self.connectivity
         cmd = f"{self.scanConsole_exe} -r {self.controller} -c {connectivity} {'--skip-reset' if skip_reset else ''}"
@@ -427,7 +311,7 @@ class yarr(hardware_control_base):
 
     def dataMergingCheck(self, testsize=None, mode=None, verbose=False, quiet=False):
         if not self.dataMergingCheck_exe:
-            msg = "No `dataMergingCheck_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.7.0/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
+            msg = "No `dataMergingCheck_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.7.1/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
             raise RuntimeError(msg)
 
         _mode = "4-to-1"
@@ -478,7 +362,7 @@ class yarr(hardware_control_base):
         self, dryrun=False, skipconfig=False, testsize=None, connectivity=None
     ):
         if not self.eyeDiagram_exe:
-            msg = "No `eyeDiagram_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.7.0/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
+            msg = "No `eyeDiagram_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.7.1/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
             raise RuntimeError(msg)
         _dryrun = ""
         _skipconfig = ""

{module_qc_tools-2.7.0 → module_qc_tools-2.7.1}/tbump.toml

@@ -1,5 +1,5 @@
 [version]
-current = "2.7.0"
+current = "2.7.1"
 
 # 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.7.0 → {new_version}"
+message_template = "Bump version: 2.7.1 → {new_version}"
 tag_template = "v{new_version}"
 
 # For each file to patch, add a [[file]] config

module_qc_tools-2.7.0/src/module_qc_tools/utils/file_lock.py

@@ -1,97 +0,0 @@
-"""File locking utilities for YARR executable coordination."""
-
-from __future__ import annotations
-
-import fcntl
-import logging
-import time
-from collections.abc import Generator
-from contextlib import contextmanager
-from pathlib import Path
-
-from rich.console import Console
-
-logger = logging.getLogger("measurement")
-
-
-@contextmanager
-def yarr_file_lock(
-    lock_path: str | Path = "/tmp/yarr.lock",
-    timeout: float = 300,
-    poll_interval: float = 1.0,
-    show_status: bool = True,
-) -> Generator[None]:
-    """
-    Context manager that acquires an exclusive file lock for YARR process coordination.
-
-    This prevents multiple YARR processes from running simultaneously,
-    which would cause conflicts and process failures.
-
-    Args:
-        lock_path: Path to the lock file (default: /tmp/yarr.lock)
-        timeout: Maximum time to wait for lock in seconds (default: 300)
-        poll_interval: Time between lock acquisition attempts (default: 1.0)
-        show_status: Whether to show rich status indicators (default: True)
-
-    Raises:
-        TimeoutError: If lock cannot be acquired within timeout period
-        FileNotFoundError: If lock file does not exist
-        PermissionError: If insufficient permissions to access lock file
-    """
-    lock_path = Path(lock_path)
-
-    if not lock_path.exists():
-        msg = f"Lock file {lock_path} does not exist"
-        raise FileNotFoundError(msg)
-
-    console = Console() if show_status else None
-    status = None
-
-    try:
-        # Open the lock file for locking
-        with lock_path.open("r", encoding="utf-8") as lock_file:
-            start_time = time.time()
-
-            if console and show_status:
-                status = console.status(
-                    f"[yellow]Waiting for YARR lock on {lock_path}..."
-                )
-                status.start()
-
-            while True:
-                try:
-                    # Try to acquire exclusive lock (non-blocking)
-                    fcntl.flock(lock_file.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
-
-                    logger.debug(f"Acquired exclusive YARR lock on {lock_path}")
-                    if status:
-                        status.update(f"[green]YARR lock acquired on {lock_path}")
-
-                    try:
-                        yield
-                    finally:
-                        # Lock is automatically released when file is closed
-                        logger.debug(f"Released YARR lock on {lock_path}")
-                        if status:
-                            status.update(f"[blue]Released YARR lock on {lock_path}")
-                            status.stop()
-
-                    break
-
-                except BlockingIOError:
-                    # Lock is held by another process
-                    elapsed = time.time() - start_time
-                    if elapsed >= timeout:
-                        if status:
-                            status.stop()
-                        msg = f"Timeout waiting for YARR lock on {lock_path} after {timeout} seconds"
-                        raise TimeoutError(msg) from None
-
-                    # Wait before trying again
-                    time.sleep(poll_interval)
-
-    except PermissionError as e:
-        if status:
-            status.stop()
-        msg = f"Permission denied accessing {lock_path}: {e}"
-        raise PermissionError(msg) from e