jupyter-analysis-tools 1.2.1__py3-none-any.whl → 1.3.0__py3-none-any.whl

jupyter_analysis_tools/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # __init__.py
 
-__version__ = "1.2.1"
+__version__ = "1.3.0"
 
 from .binning import reBin
 from .git import checkRepo, isNBstripoutActivated, isNBstripoutInstalled, isRepo

jupyter_analysis_tools/readdata.py

@@ -68,14 +68,18 @@ def xmlPDHToDict(root):
     while stack:
         elem, parentCont = stack.pop()
         elemCont = {}
-        key = elem.attrib.pop("key", None)
         idx = -1
-        if (
-            not len(list(elem)) and
-            not len(elem.attrib) and
-            not (elem.text and len(elem.text.strip()))
+        key = elem.attrib.pop("key", None)
+        if (  # get a unique key, the key can occur in multiple groups in PDH
+            key is not None and elem.tag == "group" and elem.attrib.get("id", None) is not None
+        ):
+            key = elem.attrib.pop("id")
+        if (  # skip empty elements with a key only early
+            not len(list(elem))
+            and not len(elem.attrib)
+            and not (elem.text and len(elem.text.strip()))
         ):
-            continue  # skip empty elements with a key only early
+            continue
         if elem.tag == "list":
             elemCont = []
         else:  # add attributes & values to dict
@@ -115,9 +119,8 @@ def xmlPDHToDict(root):
                 else:  # have a key
                     parentCont[parentKey] = {key: elemCont}
             else:  # parentKey exists already
-                if (
-                    not isinstance(parentCont[parentKey], list) and
-                    not isinstance(parentCont[parentKey], dict)
+                if not isinstance(parentCont[parentKey], list) and not isinstance(
+                    parentCont[parentKey], dict
                 ):
                     # if its a plain value before, make a list out of it and append in next step
                     parentCont[parentKey] = [parentCont[parentKey]]
@@ -135,7 +138,7 @@ def xmlPDHToDict(root):
     try:
         oldts = result["fileinfo"]["parameter"]["DateTime"]["value"]
         # timestamp seems to be based on around 2009-01-01 (a day give or take)
-        delta = ((39 * 365 + 10) * 24 * 3600)
+        delta = (39 * 365 + 10) * 24 * 3600
         # make it compatible to datetime.datetime routines
         result["fileinfo"]["parameter"]["DateTime"]["value"] = oldts + delta
     except KeyError:

jupyter_analysis_tools/utils.py

@@ -105,6 +105,30 @@ def addEnvScriptsToPATH():
         os.environ["PATH"] = sep.join(environPATH)
 
 
+def networkdriveMapping(cmdOutput: str = None):
+    """Returns a dict of mapping drive letters to network paths (on Windows)."""
+    if isWindows():
+        if cmdOutput is None:
+            proc = subprocess.run(["net", "use"], capture_output=True, text=True, encoding="cp850")
+            cmdOutput = proc.stdout
+        rows = [line.split() for line in cmdOutput.splitlines() if "Windows Network" in line]
+        rows = dict(
+            [row[1:3] for row in rows if row[1].endswith(":") and row[2].startswith("\\\\")]
+        )
+        return rows
+    return {}
+
+
+def makeNetworkdriveAbsolute(filepath, cmdOutput: str = None):
+    """Replaces the drive letter of the given path by the respective network path, if possible."""
+    if isWindows() and not filepath.drive.startswith(r"\\"):
+        drivemap = networkdriveMapping(cmdOutput=cmdOutput)
+        prefix = drivemap.get(filepath.drive, None)
+        if prefix is not None:
+            filepath = Path(prefix).joinpath(*filepath.parts[1:])
+    return filepath
+
+
 def checkWinFor7z():
     """Extend the PATH environment variable for access to the 7-zip executable."""
     if not isWindows():
@@ -127,7 +151,7 @@ def extract7z(fn, workdir=None):
     assert os.path.isfile(os.path.join(workdir, fn)), "Provided 7z archive '{}' not found!".format(
         fn
     )
-    print("Extracting archived McDLS results:")
+    print(f"Extracting '{fn}':")
     proc = subprocess.run(
         ["7z", "x", fn],
         cwd=workdir,

{jupyter_analysis_tools-1.2.1.dist-info → jupyter_analysis_tools-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.2.1
+Version: 1.3.0
 Summary: Yet another Python library with helpers and utilities for data analysis and processing.
 Author-email: Ingo Breßler <dev@ingobressler.net>
 License: MIT license
@@ -53,8 +53,8 @@ Yet another Python library with helpers and utilities for data analysis and proc
     :target: https://pypi.org/project/jupyter-analysis-tools
     :alt: PyPI Package latest release
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.2.1.svg
-    :target: https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.2.1...main
+.. |commits-since| image:: https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.3.0.svg
+    :target: https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.3.0...main
     :alt: Commits since latest release
 
 .. |license| image:: https://img.shields.io/pypi/l/jupyter-analysis-tools.svg
@@ -127,6 +127,36 @@ Note, to combine the coverage data from all the tox environments run:
 
 # CHANGELOG
 
+## v1.3.0 (2025-07-16)
+
+### Bug fixes
+
+* utils.extract7z: informative info message ([`80d2f71`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/80d2f7134992d59f0bfd7f5e7bc27772f77cd452))
+
+### Continuous integration
+
+* coverage: fix coverage artifact name for multiple matrix.os ([`f471599`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/f471599b8c86e29fd20b78f7cbd9291c3a6dd98a))
+
+* testing: test on Windows as well ([`4a83c39`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/4a83c3924bcb820ef0728af40b86a0f6622dfef2))
+
+### Features
+
+* utils.makeNetworkdriveAbsolute: new routines for translating a windows drive letter mount to its network location ([`823a6bf`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/823a6bfe126829381bc14d34578f342f4b9d3e8f))
+
+## v1.2.2 (2025-07-15)
+
+### Bug fixes
+
+* readPDHmeta: use unique dict keys, the xmk *key* can occur in multiple groups in PDH ([`ef41c81`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/ef41c81d40d801b5baf86f56cf9012ca35d2ccde))
+
+### Documentation
+
+* pyproject: revert specify readme+changelog document types ([`1baa762`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/1baa762d441fe0a1b7b663b9d0589de857277426))
+
+* pyproject: specify readme+changelog document types to render overview on pypi correctly ([`6e4d1e5`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/6e4d1e56640b604f971ddca8dabd8d1aff5c9bf1))
+
+* ghpages: make sure .nojekyll exists after purging old html docs ([`4847845`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/4847845cc06884b6e589b26897e83411d649ef4d))
+
 ## v1.2.1 (2025-07-11)
 
 ### Bug fixes

{jupyter_analysis_tools-1.2.1.dist-info → jupyter_analysis_tools-1.3.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-jupyter_analysis_tools/__init__.py,sha256=JTPvYYcXYakQiDz7PPUSBwpL9F6SX5ZZaADP8iWJE6A,386
+jupyter_analysis_tools/__init__.py,sha256=tqj5as0-tnD-C7LoDRTIxCvnL0YWYCGfXKmb8H-M-kA,386
 jupyter_analysis_tools/analysis.py,sha256=AiAvUO648f0PYXqLfal1kDH926neasE5c1RYFu9wtYg,1768
 jupyter_analysis_tools/binning.py,sha256=d6eXRC3IOnnJIF25OfEASyWedT71EX2nF7jAgGJ9suQ,14536
 jupyter_analysis_tools/datalocations.py,sha256=BakfiZOMcBwp-_DAn7l57lGWZmZGNnk0j73V75nLBUA,4322
 jupyter_analysis_tools/distrib.py,sha256=uyh2jXDdXR6dfd36CAoE5_psoFF0bfA6l1wletPD7Xo,16515
 jupyter_analysis_tools/git.py,sha256=mqSk5nnAFrmk1_2KFuKVrDWOkRbGbAQOq2N1DfxhNpg,2216
 jupyter_analysis_tools/plotting.py,sha256=L2gwSjlBVK8OneAfSuna3vCJIg2rSEdvd9TfEbM2Als,1183
-jupyter_analysis_tools/readdata.py,sha256=QG0cYA0dX6kmrMIdjHJoMWuIwwZbd0uYitztcxr_AN0,5829
-jupyter_analysis_tools/utils.py,sha256=dFE34fYQS7ivCfNy0nwwNPyBdZhIzW9QrxwjvvIHlIQ,5319
+jupyter_analysis_tools/readdata.py,sha256=6Tncwo3NSYAnyLQzAhDtiUyp1Xpw3CahqQ_5NeGhJqI,6030
+jupyter_analysis_tools/utils.py,sha256=EbRooLCGODH8tjQVE8-OuuPoI4weKLzmxdFY794En_k,6327
 jupyter_analysis_tools/widgets.py,sha256=rA8qPvY9nS1OtykZwXtCTG29K-N_MYFVb5Aj8yK40_s,2996
-jupyter_analysis_tools-1.2.1.dist-info/licenses/AUTHORS.rst,sha256=SUxxgElDBm6WdCbBBFfcr0ZE3SolWL0T0aS5Fym1198,100
-jupyter_analysis_tools-1.2.1.dist-info/licenses/LICENSE,sha256=SrbIwXA1ZLTO6uwZneJMpvdgiC-3fhNl0vwb3ALoY4g,1107
-jupyter_analysis_tools-1.2.1.dist-info/METADATA,sha256=3I-R__QvIkGKunshlZeGeAit7pOjYzAWiUGyyo5BiaQ,37099
-jupyter_analysis_tools-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jupyter_analysis_tools-1.2.1.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
-jupyter_analysis_tools-1.2.1.dist-info/RECORD,,
+jupyter_analysis_tools-1.3.0.dist-info/licenses/AUTHORS.rst,sha256=SUxxgElDBm6WdCbBBFfcr0ZE3SolWL0T0aS5Fym1198,100
+jupyter_analysis_tools-1.3.0.dist-info/licenses/LICENSE,sha256=SrbIwXA1ZLTO6uwZneJMpvdgiC-3fhNl0vwb3ALoY4g,1107
+jupyter_analysis_tools-1.3.0.dist-info/METADATA,sha256=6iqmTX_dO2RwXtQG4oU3mvsjl9fm8Xm3h4LNfpGtv6c,38742
+jupyter_analysis_tools-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jupyter_analysis_tools-1.3.0.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
+jupyter_analysis_tools-1.3.0.dist-info/RECORD,,