dccQuantities 2.1.0__tar.gz → 2.2.0__tar.gz

{dccquantities-2.1.0/src/dccQuantities.egg-info → dccquantities-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dccQuantities
-Version: 2.1.0
+Version: 2.2.0
 Summary: Python classes for working with DDC calibration data
 Author: Vanessa Stehr, Thomas Bruns
 Author-email: Benedikt Seeger <benedikt.seeger@ptb.de>, Jaime Gonzalez Gomez <jaime.gonzalez-gomez@ptb.de>
@@ -21,14 +21,9 @@ License-File: LICENSE
 Requires-Dist: dsiUnits~=3.1
 Requires-Dist: dccXMLJSONConv~=3.0.0.dev8
 Requires-Dist: metas_unclib
-Requires-Dist: numpy
+Requires-Dist: numpy>=2.0.0
 Requires-Dist: PyBackport; python_version < "3.11"
 Requires-Dist: pythonnet
-Provides-Extra: docs
-Requires-Dist: mkdocs; extra == "docs"
-Requires-Dist: mkdocstrings-python; extra == "docs"
-Requires-Dist: mike; extra == "docs"
-Requires-Dist: ruff; extra == "docs"
 Dynamic: license-file
 
 # dccQuantities

{dccquantities-2.1.0 → dccquantities-2.2.0}/pyproject.toml

@@ -6,6 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "dccQuantities"
 description = "Python classes for working with DDC calibration data"
 dynamic = ["readme", "version"]
+# Python 3.14 is not supported due to a 'pythonnet' open issue: https://github.com/pythonnet/pythonnet/issues/2610
 requires-python = ">=3.9,<3.14"
 
 # SPDX license expression + point at your LICENSE file
@@ -32,7 +33,7 @@ dependencies = [
   "dsiUnits~=3.1",
   "dccXMLJSONConv~=3.0.0.dev8",
   "metas_unclib",
-  "numpy",
+  "numpy>=2.0.0",
   "PyBackport ; python_version < '3.11'",
   "pythonnet",
 ]
@@ -42,18 +43,12 @@ Homepage = "https://gitlab1.ptb.de/digitaldynamicmeasurement/dccQuantities"
 Repository = "https://gitlab1.ptb.de/digitaldynamicmeasurement/dccQuantities"
 Documentation = "https://gitlab-pages.ptb.de/digitaldynamicmeasurement/dcc-and-dsi/dccQuantities/"
 
-[project.optional-dependencies]
-docs = ["mkdocs", "mkdocstrings-python", "mike", "ruff"]
-
 [tool.setuptools.dynamic]
 version = { attr = "dcc_quantities._version.__version__" }
 readme = { file = ["README.md"], content-type = "text/markdown" }
 
-[project.scripts]
-quantity-docs = "dcc_quantities._cli:deploy_local_docs"
-
 [tool.coverage.run]
-omit = ["_cli.py", "_version.py"]
+omit = ["_version.py"]
 
 [tool.coverage.report]
 exclude_also = [

{dccquantities-2.1.0 → dccquantities-2.2.0/src/dccQuantities.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dccQuantities
-Version: 2.1.0
+Version: 2.2.0
 Summary: Python classes for working with DDC calibration data
 Author: Vanessa Stehr, Thomas Bruns
 Author-email: Benedikt Seeger <benedikt.seeger@ptb.de>, Jaime Gonzalez Gomez <jaime.gonzalez-gomez@ptb.de>
@@ -21,14 +21,9 @@ License-File: LICENSE
 Requires-Dist: dsiUnits~=3.1
 Requires-Dist: dccXMLJSONConv~=3.0.0.dev8
 Requires-Dist: metas_unclib
-Requires-Dist: numpy
+Requires-Dist: numpy>=2.0.0
 Requires-Dist: PyBackport; python_version < "3.11"
 Requires-Dist: pythonnet
-Provides-Extra: docs
-Requires-Dist: mkdocs; extra == "docs"
-Requires-Dist: mkdocstrings-python; extra == "docs"
-Requires-Dist: mike; extra == "docs"
-Requires-Dist: ruff; extra == "docs"
 Dynamic: license-file
 
 # dccQuantities

{dccquantities-2.1.0 → dccquantities-2.2.0}/src/dccQuantities.egg-info/SOURCES.txt

@@ -5,11 +5,9 @@ pyproject.toml
 src/dccQuantities.egg-info/PKG-INFO
 src/dccQuantities.egg-info/SOURCES.txt
 src/dccQuantities.egg-info/dependency_links.txt
-src/dccQuantities.egg-info/entry_points.txt
 src/dccQuantities.egg-info/requires.txt
 src/dccQuantities.egg-info/top_level.txt
 src/dcc_quantities/__init__.py
-src/dcc_quantities/_cli.py
 src/dcc_quantities/_config.py
 src/dcc_quantities/_helpers.py
 src/dcc_quantities/_version.py
@@ -26,9 +24,6 @@ src/dcc_quantities/parse_uncertainties.py
 src/dcc_quantities/_abc/__init__.py
 src/dcc_quantities/_abc/abstract_list_type.py
 src/dcc_quantities/_abc/abstract_quantity_type_data.py
-src/dcc_quantities/query/__init__.py
-src/dcc_quantities/query/_operators.py
-src/dcc_quantities/query/slices.py
 src/dcc_quantities/serializers/__init__.py
 src/dcc_quantities/serializers/_explicit_serializer_mixin.py
 src/dcc_quantities/serializers/_field_spec.py
@@ -40,15 +35,12 @@ src/dcc_quantities/si_data/_base_si_type.py
 src/dcc_quantities/si_data/si_data_type.py
 src/dcc_quantities/si_data/si_hybrid.py
 tests/test_dcc_chars_xml_list.py
-tests/test_dcc_no_quantity.py
 tests/test_dcc_text.py
-tests/test_generate_example_table_data.py
-tests/test_helpers.py
 tests/test_math.py
 tests/test_parser.py
+tests/test_quantity_type.py
 tests/test_quantity_type_collector.py
 tests/test_serilizer.py
 tests/test_si_real_list.py
-tests/test_si_real_list_parse_data.py
 tests/test_surface_flat_table_generation.py
 tests/test_tables.py

{dccquantities-2.1.0 → dccquantities-2.2.0}/src/dccQuantities.egg-info/requires.txt

@@ -1,14 +1,8 @@
 dsiUnits~=3.1
 dccXMLJSONConv~=3.0.0.dev8
 metas_unclib
-numpy
+numpy>=2.0.0
 pythonnet
 
 [:python_version < "3.11"]
 PyBackport
-
-[docs]
-mkdocs
-mkdocstrings-python
-mike
-ruff

{dccquantities-2.1.0 → dccquantities-2.2.0}/src/dcc_quantities/_abc/abstract_quantity_type_data.py

@@ -4,7 +4,6 @@ from typing import Any, Iterator
 class AbstractQuantityTypeData:
     def __init__(self):
         self.data = "None"
-        self._sorted = None
 
     def _iter_items(self) -> Iterator[tuple[str, Any]]:
         """Iterator over all the class' items.

{dccquantities-2.1.0 → dccquantities-2.2.0}/src/dcc_quantities/_config.py

@@ -45,9 +45,5 @@ class DccConfiguration:
             system_lang = locale.getlocale()
         return system_lang[0].split("_")[0].lower()
 
-    @property
-    def system_lang(self) -> str:
-        return self.preferredLangs[0]
-
 
 dcc_config = DccConfiguration()

dccquantities-2.2.0/src/dcc_quantities/_helpers.py

@@ -0,0 +1,69 @@
+from __future__ import annotations
+
+import copy
+import warnings
+from typing import Optional
+
+from dcc_quantities.serializers.dcc_element_key import DccElementKey
+from dcc_quantities.serializers.dcc_element_parser import dcc_type_collector
+
+
+def unexpected_key_serialization_handler(result: dict, key: str, value, class_name: str) -> None:
+    """
+    Handles unexpected keys during JSON serialization.
+
+    If the key contains 'dcc:' or 'si:', it is assumed to be DCC-related and is added to the result,
+    otherwise a warning is issued and the key is ignored.
+    """
+    if "dcc:" in str(key) or "si:" in str(key):
+        warnings.warn(
+            f"Found unexpected key {key} while converting {class_name} to JSON."
+            f" Assuming this is DCC data therefore adding it to the JSON.",
+            RuntimeWarning,
+            stacklevel=3,
+        )
+        result[key] = value
+    else:
+        warnings.warn(
+            f"Found unexpected key {key} while converting {class_name} to JSON."
+            f" Assuming this other data is unrelated to DCC and ignoring.",
+            RuntimeWarning,
+            stacklevel=3,
+        )
+
+
+def parse_attributes(json_dict: dict):
+    attributes = {}
+    if "@id" in json_dict:
+        attributes["id"] = json_dict["@id"]
+    if "@refId" in json_dict:
+        attributes["ref_id"] = json_dict["@refId"]
+    if "@refType" in json_dict:
+        attributes["ref_type"] = json_dict["@refType"]
+    if "@lang" in json_dict:
+        attributes["lang"] = json_dict["@lang"]
+    if "@index" in json_dict:
+        attributes["index"] = json_dict["@index"]
+    return attributes
+
+
+def replace_quantities_in_dict(
+    json_dict: dict, parser, search_keys: Optional[list] = None, return_quantity_list: bool = False
+):
+    if search_keys is None:
+        search_keys = [DccElementKey.QUANTITY]
+    found_quantities = dcc_type_collector(json_dict, search_keys=search_keys)
+    json_data = copy.deepcopy(json_dict)
+    if return_quantity_list:
+        quantity_list = []
+    for path, result in found_quantities:
+        parsed_object = parser(result)
+        if return_quantity_list:
+            quantity_list.append((path, parsed_object))
+        current_node = json_data
+        for key in path[:-1]:
+            current_node = current_node[key]
+        current_node[path[-1]] = parsed_object
+    if return_quantity_list:
+        return json_data, quantity_list
+    return json_data

{dccquantities-2.1.0 → dccquantities-2.2.0}/src/dcc_quantities/_version.py

@@ -1,3 +1,3 @@
 """Versioning of the package"""
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"

{dccquantities-2.1.0 → dccquantities-2.2.0}/src/dcc_quantities/dcc_chars_xml_list.py

@@ -7,7 +7,6 @@ from typing import Any
 class DccCharsXMLList:
     def __init__(self, data: list[str]):
         self.data = data
-        self._sorted = None
 
     def __len__(self) -> int:
         return len(self.data)
@@ -31,13 +30,6 @@ class DccCharsXMLList:
     def to_json_dict(self) -> dict[str, Any]:
         return {"dcc:charsXMLList": self.data}
 
-    @property
-    def sorted(self) -> bool:
-        if self._sorted is None:
-            self._sorted = all((self.data[i] <= self.data[i + 1] for i in range(len(self.data) - 1)))
-        "Check if the list of strings is sorted in ascending order."
-        return self._sorted
-
 
 def parse(json_dict: dict | list) -> DccCharsXMLList:
     if isinstance(json_dict, list):

{dccquantities-2.1.0 → dccquantities-2.2.0}/src/dcc_quantities/dcc_no_quantity.py

@@ -25,18 +25,16 @@ class DccNoQuantity(AbstractQuantityTypeData):
         self.ref_id = ref_id
         self.ref_type = ref_type
         self.name = DccLangName(name)
-        self._sorted = False
 
     def __len__(self) -> int:
         return len(self.data["content"]) + len(self.data["file"]) + len(self.data["formula"])
 
     def to_json_dict(self) -> dict:
-        private_keys = ["_sorted"]
         key_mapping = {"id": "@id", "ref_id": "@refId", "ref_type": "@refType"}
         data_key_mapping = {"content": "dcc:content", "file": "dcc:file", "formula": "dcc:formula"}
         result = {}
         for key, value in self._iter_items():
-            if value is None or key in private_keys:
+            if value is None:
                 continue
 
             if key in key_mapping:
@@ -47,16 +45,10 @@ class DccNoQuantity(AbstractQuantityTypeData):
                         result[data_key_mapping[data_key]] = []
                         for item in data_value:
                             result[data_key_mapping[data_key]].append(item.to_json_dict())
-                # if set(self.data) - set(data_key_mapping):
-                #     pass
             else:
                 unexpected_key_serialization_handler(result, key, value, self.__class__.__name__)
         return {"dcc:noQuantity": result}
 
-    @property
-    def sorted(self) -> bool:
-        return self._sorted
-
 
 def parse(json_dict) -> DccNoQuantity:
     # fixme: There are multiple issues here.