jupyter-analysis-tools 1.2.2__tar.gz → 1.3.0__tar.gz

{jupyter_analysis_tools-1.2.2 → jupyter_analysis_tools-1.3.0}/.cookiecutterrc

@@ -20,7 +20,7 @@ default_context:
     release_date:              'today'
     year_from:                 '2018'
     year_to:                   '2023'
-    version:                   '1.2.2'
+    version:                   '1.3.0'
     pypi_host:                 'pypi.org'
     license:                   'MIT license'
     sphinx_theme:              'furo'

{jupyter_analysis_tools-1.2.2 → jupyter_analysis_tools-1.3.0}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 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

{jupyter_analysis_tools-1.2.2 → jupyter_analysis_tools-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.2.2
+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.2.svg
-    :target: https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.2.2...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,22 @@ 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

{jupyter_analysis_tools-1.2.2 → jupyter_analysis_tools-1.3.0}/README.rst

@@ -14,8 +14,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.2.svg
-    :target: https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.2.2...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

{jupyter_analysis_tools-1.2.2 → jupyter_analysis_tools-1.3.0}/docs/conf.py

@@ -29,7 +29,7 @@ project = "Jupyter Analysis Tools"
 year = "2018-2023"
 author = "Ingo Breßler"
 copyright = "{0}, {1}".format(year, author)
-version = "1.2.2"
+version = "1.3.0"
 release = version
 commit_id = None
 try:

{jupyter_analysis_tools-1.2.2 → jupyter_analysis_tools-1.3.0}/src/jupyter_analysis_tools/__init__.py

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

{jupyter_analysis_tools-1.2.2 → jupyter_analysis_tools-1.3.0}/src/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.2 → jupyter_analysis_tools-1.3.0}/src/jupyter_analysis_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.2.2
+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.2.svg
-    :target: https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.2.2...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,22 @@ 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

jupyter_analysis_tools-1.3.0/tests/utils.py

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# tests/utils.py
+
+
+import os
+from pathlib import Path
+
+from jupyter_analysis_tools.utils import (
+    appendToPATH,
+    isWindows,
+    makeNetworkdriveAbsolute,
+    networkdriveMapping,
+)
+
+# output of 'net use' command on Windows
+outNetUse = r"""Neue Verbindungen werden gespeichert.
+
+
+Status       Lokal     Remote                    Netzwerk
+
+-------------------------------------------------------------------------------
+OK           G:        \\ALPHA\BETA              Microsoft Windows Network
+OK           K:        \\GAM\MMA                 Microsoft Windows Network
+OK           M:        \\user\drive\uname        Microsoft Windows Network
+OK           T:        \\test\foldername         Microsoft Windows Network
+OK                     \\psi\folder              Microsoft Windows Network
+Der Befehl wurde erfolgreich ausgeführt.
+"""
+
+
+def test_appendToPATH(capsys):
+    # Setting up a PATH for testing first (platform dependent).
+    testpath = "/usr/local/sbin:/usr/local/bin:/sbin:/usr/games:/usr/local/games:/snap/bin"
+    if isWindows():
+        testpath = "something else"
+    os.environ["PATH"] = testpath
+    assert os.environ["PATH"] == testpath
+
+    if not isWindows():  # Linux edition
+        appendToPATH("/tmp", ("one", "two"), verbose=True)
+        captured = capsys.readouterr()
+        assert (
+            captured.out
+            == """\
+     /tmp/one [exists: False]
+     /tmp/two [exists: False]
+"""
+        )
+        assert os.environ["PATH"] == testpath + ":/tmp/one:/tmp/two"
+
+    else:  # Windows edition
+        appendToPATH(r"C:\Windows", ("one", "two"), verbose=True)
+        captured = capsys.readouterr()
+        assert (
+            captured.out
+            == """\
+     C:\\Windows\\one [exists: False]
+     C:\\Windows\\two [exists: False]
+"""
+        )
+        assert os.environ["PATH"] == testpath + r";C:\Windows\one;C:\Windows\two"
+
+
+def test_networkdriveMapping():
+    if isWindows():
+        map = networkdriveMapping(cmdOutput=outNetUse)
+        assert map == {
+            "G:": "\\\\ALPHA\\BETA",
+            "K:": "\\\\GAM\\MMA",
+            "M:": "\\\\user\\drive\\uname",
+            "T:": "\\\\test\\foldername",
+        }
+
+
+def test_makeNetworkdriveAbsolute():
+    if isWindows():
+        filepath = Path(r"M:\some\folders\a file name.ext")
+        newpath = makeNetworkdriveAbsolute(filepath, cmdOutput=outNetUse)
+        assert filepath != newpath
+        assert newpath == Path(r"\\user\drive\uname\some\folders\a file name.ext")

jupyter_analysis_tools-1.2.2/tests/utils.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# tests/utils.py
-
-
-import os
-
-from jupyter_analysis_tools.utils import appendToPATH, isWindows
-
-
-def test_appendToPATH(capsys):
-    # Setting up a PATH for testing first (platform dependent).
-    testpath = "/usr/local/sbin:/usr/local/bin:/sbin:/usr/games:/usr/local/games:/snap/bin"
-    if isWindows():
-        testpath = "something else"
-    os.environ["PATH"] = testpath
-    assert os.environ["PATH"] == testpath
-
-    if not isWindows():  # Linux edition
-        appendToPATH("/tmp", ("one", "two"), verbose=True)
-        captured = capsys.readouterr()
-        assert captured.out == """\
-     /tmp/one [exists: False]
-     /tmp/two [exists: False]
-"""
-        assert os.environ["PATH"] == testpath+":/tmp/one:/tmp/two"
-
-    else:  # Windows edition
-        appendToPATH(r"C:\Windows", ("one", "two"), verbose=True)
-        captured = capsys.readouterr()
-        assert captured.out == """\
-     C:\\Windows\\one [exists: False]
-     C:\\Windows\\two [exists: False]
-"""
-        assert os.environ["PATH"] == testpath+r";C:\Windows\one;C:\Windows\two"