jupyter-analysis-tools 1.4.0__tar.gz → 1.4.1__tar.gz

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/.copier-answers.yml

@@ -22,4 +22,4 @@ repo_main_branch: main
 repo_name: jupyter-analysis-tools
 repo_userorg: BAMresearch
 sphinx_theme: furo
-version: 1.4.0
+version: 1.4.1

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v1.4.1 (2025-08-01)
+
+### Bug fixes
+
+* **utils**: networkdriveMapping() for Linux, with tests ([`3f4deeb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/3f4deebdf57cc9162121c26d5d7d8484f1f0ec63))
+
+### Testing
+
+* **utils**: remove debug output, should work now ([`1117c89`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/1117c89d4206c6880373e3b8765dff6e48d3ccd5))
+
 ## v1.4.0 (2025-07-28)
 
 ### Continuous integration

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.4.0
+Version: 1.4.1
 Summary: Yet another Python library with helpers and utilities for data analysis and processing.
 Author-email: Ingo Breßler <ingo.bressler@bam.de>, "Brian R. Pauw" <brian.pauw@bam.de>
 License-Expression: MIT
@@ -35,10 +35,10 @@ Requires-Dist: matplotlib
 Requires-Dist: ipywidgets
 Dynamic: license-file
 
-# Jupyter Analysis Tools (v1.4.0)
+# Jupyter Analysis Tools (v1.4.1)
 
 [![PyPI Package latest release](https://img.shields.io/pypi/v/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
-[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.4.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.0...main)
+[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.4.1.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.1...main)
 [![License](https://img.shields.io/pypi/l/jupyter-analysis-tools.svg)](https://en.wikipedia.org/wiki/MIT_license)
 [![Supported versions](https://img.shields.io/pypi/pyversions/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
 [![PyPI Wheel](https://img.shields.io/pypi/wheel/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools#files)
@@ -97,6 +97,16 @@ are installed:
 
 # CHANGELOG
 
+## v1.4.1 (2025-08-01)
+
+### Bug fixes
+
+* **utils**: networkdriveMapping() for Linux, with tests ([`3f4deeb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/3f4deebdf57cc9162121c26d5d7d8484f1f0ec63))
+
+### Testing
+
+* **utils**: remove debug output, should work now ([`1117c89`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/1117c89d4206c6880373e3b8765dff6e48d3ccd5))
+
 ## v1.4.0 (2025-07-28)
 
 ### Continuous integration

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/README.md

@@ -1,7 +1,7 @@
-# Jupyter Analysis Tools (v1.4.0)
+# Jupyter Analysis Tools (v1.4.1)
 
 [![PyPI Package latest release](https://img.shields.io/pypi/v/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
-[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.4.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.0...main)
+[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.4.1.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.1...main)
 [![License](https://img.shields.io/pypi/l/jupyter-analysis-tools.svg)](https://en.wikipedia.org/wiki/MIT_license)
 [![Supported versions](https://img.shields.io/pypi/pyversions/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
 [![PyPI Wheel](https://img.shields.io/pypi/wheel/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools#files)

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/docs/conf.py

@@ -32,7 +32,7 @@ project = "Jupyter Analysis Tools"
 year = "2018-2025"
 author = "Ingo Breßler and Brian R. Pauw"
 copyright = "{0}, {1}".format(year, author)
-version = "1.4.0"
+version = "1.4.1"
 release = version
 commit_id = None
 try:

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/src/jupyter_analysis_tools/__init__.py

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

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/src/jupyter_analysis_tools/utils.py

@@ -117,16 +117,47 @@ def networkdriveMapping(cmdOutput: str = None):
             [row[1:3] for row in rows if row[1].endswith(":") and row[2].startswith("\\\\")]
         )
         return rows
+    else:  # Linux (tested) or macOS (untested)
+        if cmdOutput is None:
+            proc = subprocess.run(["mount"], capture_output=True, text=True)
+            cmdOutput = proc.stdout
+
+        def parse(line):
+            # position of last opening parenthesis, start of options list
+            lastParen = list(i for i, c in enumerate(line) if "(" == c)[-1]
+            line = line[:lastParen].strip()
+            spaces = list(i for i, c in enumerate(line) if " " == c)
+            fstype = line[spaces[-1] :].strip()  # last remaining word is the filesystem type
+            line = line[: spaces[-2]].strip()  # strip the 'type' indicator as well
+            sepIdx = line.find(" on /")  # separates destination from mount point
+            dest = line[:sepIdx].strip()
+            mountpoint = line[sepIdx + 4 :].strip()
+            yield (mountpoint, dest, fstype)
+
+        return {
+            mp: dst
+            for line in cmdOutput.strip().splitlines()
+            for (mp, dst, fstype) in parse(line)
+            if fstype in ("nfs", "cifs", "sshfs", "afs", "ext4")
+        }
     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"\\"):
+    if filepath.drive.startswith(r"\\"):
+        return  # it's a UNC path already
+    if isWindows():
         drivemap = networkdriveMapping(cmdOutput=cmdOutput)
         prefix = drivemap.get(filepath.drive, None)
         if prefix is not None:
             filepath = Path(prefix).joinpath(*filepath.parts[1:])
+    else:  # Linux or macOS
+        drivemap = networkdriveMapping(cmdOutput=cmdOutput)
+        # search for the mountpoint, starting with the longest, most specific, first
+        for mp, target in sorted(drivemap.items(), key=lambda tup: len(tup[0]), reverse=True):
+            if filepath.is_relative_to(mp):
+                return Path(target).joinpath(filepath.relative_to(mp))
     return filepath
 
 
@@ -152,7 +183,7 @@ def extract7z(fn, workdir=None):
     assert os.path.isfile(os.path.join(workdir, fn)), "Provided 7z archive '{}' not found!".format(
         fn
     )
-    print(f"Extracting '{fn}':")
+    print(f"Extracting '{fn}': ")
     proc = subprocess.run(
         ["7z", "x", fn],
         cwd=workdir,
@@ -185,7 +216,7 @@ def setPackage(globalsdict):
         sys.path.insert(0, searchpath)
     globalsdict["__package__"] = path.name
     globalsdict["__name__"] = path.name
-    print(f"Setting the current directory as package '{path.name}':\n  {path}.")
+    print(f"Setting the current directory as package '{path.name}': \n  {path}.")
 
 
 def grouper(iterable, n, fillvalue=None):

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/src/jupyter_analysis_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.4.0
+Version: 1.4.1
 Summary: Yet another Python library with helpers and utilities for data analysis and processing.
 Author-email: Ingo Breßler <ingo.bressler@bam.de>, "Brian R. Pauw" <brian.pauw@bam.de>
 License-Expression: MIT
@@ -35,10 +35,10 @@ Requires-Dist: matplotlib
 Requires-Dist: ipywidgets
 Dynamic: license-file
 
-# Jupyter Analysis Tools (v1.4.0)
+# Jupyter Analysis Tools (v1.4.1)
 
 [![PyPI Package latest release](https://img.shields.io/pypi/v/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
-[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.4.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.0...main)
+[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.4.1.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.1...main)
 [![License](https://img.shields.io/pypi/l/jupyter-analysis-tools.svg)](https://en.wikipedia.org/wiki/MIT_license)
 [![Supported versions](https://img.shields.io/pypi/pyversions/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
 [![PyPI Wheel](https://img.shields.io/pypi/wheel/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools#files)
@@ -97,6 +97,16 @@ are installed:
 
 # CHANGELOG
 
+## v1.4.1 (2025-08-01)
+
+### Bug fixes
+
+* **utils**: networkdriveMapping() for Linux, with tests ([`3f4deeb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/3f4deebdf57cc9162121c26d5d7d8484f1f0ec63))
+
+### Testing
+
+* **utils**: remove debug output, should work now ([`1117c89`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/1117c89d4206c6880373e3b8765dff6e48d3ccd5))
+
 ## v1.4.0 (2025-07-28)
 
 ### Continuous integration

{jupyter_analysis_tools-1.4.0 → jupyter_analysis_tools-1.4.1}/tests/utils.py

@@ -28,6 +28,25 @@ OK                     \\psi\folder              Microsoft Windows Network
 Der Befehl wurde erfolgreich ausgeführt.
 """
 
+# sample output of 'mount' command on Linux
+outMount = (
+    "sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,relatime)\n"
+    "proc on /proc type proc (rw,nosuid,nodev,noexec,relatime)\n"
+    "tmpfs on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=13148680k,mode=755,inode64)\n"
+    "//abc02.def.ault.de/X23/somename on /mnt/some (ugly) on type name type cifs "
+    "(rw,nosuid,nodev,relatime,vers=3.0,cache=strict,upcall_target=app,username=dhdhfh,"
+    "uid=1000,forceuid,gid=1000,forcegid,addr=10.0.1.2,file_mode=0660,dir_mode=0770,soft,nounix,"
+    "mapposix,rsize=4194304,wsize=4194304,bsize=1048576,retrans=1,echo_interval=60,actimeo=1,"
+    "closetimeo=1)\n"
+    "udev on /dev type devtmpfs (rw,nosuid,relatime,size=65700820k,nr_inodes=16425205,mode=755,"
+    "inode64)\n"
+    "//xyz04.fgsd.asd.com/G2S/GH31 on /mnt/gh 12 type cifs (rw,nosuid,nodev,relatime,vers=3.0,"
+    "cache=strict,upcall_target=app,username=dhdhfh,uid=1000,forceuid,gid=1000,forcegid,"
+    "addr=10.6.1.5,file_mode=0660,dir_mode=0770,soft,nounix,mapposix,rsize=4194304,wsize=4194304,"
+    "bsize=1048576,retrans=1,echo_interval=60,actimeo=1,closetimeo=1)\n"
+    "devpts on /dev/pts type devpts (rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000)"
+)
+
 
 def test_appendToPATH(capsys):
     # Setting up a PATH for testing first (platform dependent).
@@ -71,6 +90,12 @@ def test_networkdriveMapping():
             "M:": "\\\\user\\drive\\uname",
             "T:": "\\\\test\\foldername",
         }
+    else:  # Linux or macOS
+        map = networkdriveMapping(cmdOutput=outMount)
+        assert map == {
+            "/mnt/gh 12": "//xyz04.fgsd.asd.com/G2S/GH31",
+            "/mnt/some (ugly) on type name": "//abc02.def.ault.de/X23/somename",
+        }
 
 
 def test_makeNetworkdriveAbsolute():
@@ -79,6 +104,11 @@ def test_makeNetworkdriveAbsolute():
         newpath = makeNetworkdriveAbsolute(filepath, cmdOutput=outNetUse)
         assert filepath != newpath
         assert newpath == Path(r"\\user\drive\uname\some\folders\a file name.ext")
+    else:  # Linux or macOS
+        filepath = Path("/mnt/some (ugly) on type name/some/folders/a file name.ext")
+        newpath = makeNetworkdriveAbsolute(filepath, cmdOutput=outMount)
+        assert filepath != newpath
+        assert newpath == Path("//abc02.def.ault.de/X23/somename/some/folders/a file name.ext")
 
 
 def test_naturalKey():