module-qc-database-tools 2.11.1__tar.gz → 2.11.3__tar.gz

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/.zenodo.json

@@ -1,8 +1,8 @@
 {
   "description": " general python tool for interfacing with databases during module QC tests for the ATLAS ITk project",
   "license": "MIT",
-  "title": "atlas-itk-pixel-modules/mqdbt: v2.11.1",
-  "version": "v2.11.1",
+  "title": "atlas-itk-pixel-modules/mqdbt: v2.11.3",
+  "version": "v2.11.3",
   "upload_type": "software",
   "creators": [
     {
@@ -80,7 +80,7 @@
   "related_identifiers": [
     {
       "scheme": "url",
-      "identifier": "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-database-tools/-/tree/v2.11.1",
+      "identifier": "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-database-tools/-/tree/v2.11.3",
       "relation": "isSupplementTo"
     }
   ]

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/CITATION.cff

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

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: module-qc-database-tools
-Version: 2.11.1
+Version: 2.11.3
 Summary: Python wrapper to interface with LocalDB and Production DB for common tasks for pixel modules.
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-database-tools
 Project-URL: Bug Tracker, https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-database-tools/issues
@@ -63,7 +63,7 @@ Requires-Dist: typing-extensions>=4.0; python_version < '3.10'
 Requires-Dist: urllib3<2,>=1.26.20; 'el7.x86_64' in platform_release
 Description-Content-Type: text/markdown
 
-# Module QC Database Tools v2.11.1
+# Module QC Database Tools v2.11.3
 
 The package to regisiter ITkPixV1.1 modules, and generate YARR configs from ITk
 production database using `itkdb` API.

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/README.md

@@ -1,4 +1,4 @@
-# Module QC Database Tools v2.11.1
+# Module QC Database Tools v2.11.3
 
 The package to regisiter ITkPixV1.1 modules, and generate YARR configs from ITk
 production database using `itkdb` API.

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/docs/history.md

@@ -12,6 +12,8 @@ and this project adheres to
 
 **_Changed:_**
 
+- in case of duplicated chip config, get the latest one by its `dateTime` (!166)
+
 **_Added:_**
 
 **_Fixed:_**

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/docs/install.md

@@ -90,7 +90,7 @@ package.
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install -U pip
-$ python -m pip install -U pip module-qc-database-tools==2.11.1
+$ python -m pip install -U pip module-qc-database-tools==2.11.3
 ```
 
 ### via uv
@@ -99,7 +99,7 @@ $ python -m pip install -U pip module-qc-database-tools==2.11.1
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install uv
-$ uv pip install module-qc-database-tools==2.11.1
+$ uv pip install module-qc-database-tools==2.11.3
 ```
 
 # Usage

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/src/module_qc_database_tools/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.11.1'
-__version_tuple__ = version_tuple = (2, 11, 1)
+__version__ = version = '2.11.3'
+__version_tuple__ = version_tuple = (2, 11, 3)
 
 __commit_id__ = commit_id = None

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/src/module_qc_database_tools/core.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections
 import copy
 import json
 import logging
@@ -27,6 +28,7 @@ from module_qc_database_tools.utils import (
 )
 
 log = logging.getLogger(__name__)
+# pylint: disable=too-many-lines
 
 
 class Module:
@@ -361,6 +363,26 @@ class Chip:
 
         if version == "latest" and len(self.attachments) >= 3:
             checklist = [".json", layer_config, suffix]
+            log.debug(self.attachments)
+            ## reverse-sort attachments by date, so that we get the latest one in case of duplication
+            self.attachments = sorted(
+                self.attachments, key=lambda d: d["dateTime"], reverse=True
+            )
+            ## check for duplicates and print out warning
+            _titles = [item.get("title", None) for item in self.attachments]
+            ## remove None in case an attachment has no title
+            _titles = [_title for _title in _titles if _title is not None]
+            log.debug(_titles)
+            _duplicates = [
+                item
+                for item, count in collections.Counter(_titles).items()
+                if count > 1
+            ]
+            if _duplicates:
+                log.warning(
+                    "These FE configs have multiple entries, please fix! %s",
+                    _duplicates,
+                )
             for item in self.attachments:
                 title = item["title"] or ""
                 if all(check in title for check in checklist):
@@ -373,6 +395,7 @@ class Chip:
                     )
                     try:
                         chip_template = self.get_latest_configs(item, speed)
+                        break
                     except RuntimeError as esnake:
                         log.warning(
                             "Unable to find latest config for FE%i (chip %s): %s. Make sure all sets of configs are present in the database.",

{module_qc_database_tools-2.11.1 → module_qc_database_tools-2.11.3}/tbump.toml

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