hdx-python-utilities 4.1.0__tar.gz → 4.1.1__tar.gz

{hdx_python_utilities-4.1.0 → hdx_python_utilities-4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-utilities
-Version: 4.1.0
+Version: 4.1.1
 Summary: HDX Python Utilities for streaming tabular data, date and time handling and other helpful functions
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-utilities
 Author-email: Michael Rans <rans@email.com>

{hdx_python_utilities-4.1.0 → hdx_python_utilities-4.1.1}/src/hdx/utilities/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.1.0'
-__version_tuple__ = version_tuple = (4, 1, 0)
+__version__ = version = '4.1.1'
+__version_tuple__ = version_tuple = (4, 1, 1)
 
 __commit_id__ = commit_id = None

{hdx_python_utilities-4.1.0 → hdx_python_utilities-4.1.1}/src/hdx/utilities/path.py

@@ -1,6 +1,7 @@
 """Directory Path Utilities."""
 
 import contextlib
+import inspect
 import logging
 import sys
 from collections.abc import Iterable, Iterator, Sequence
@@ -11,6 +12,7 @@ from os.path import (
 from pathlib import Path
 from shutil import rmtree
 from tempfile import gettempdir
+from typing import Any
 
 from hdx.utilities.loader import load_text
 from hdx.utilities.saver import save_text
@@ -23,34 +25,45 @@ class NotFoundError(Exception):
     pass
 
 
-def script_dir(*args, **kwargs) -> Path:
+def script_dir(pyobject: Any, follow_symlinks: bool = True) -> Path:
     """Get current script's directory.
 
+    Args:
+        pyobject: Any Python object in the script
+        follow_symlinks: Follow symlinks or not. Defaults to True.
+
     Returns:
         Current script's directory
     """
     if getattr(sys, "frozen", False):
-        # PyInstaller bundle
-        app_path = Path(sys.executable)
+        # Frozen (PyInstaller, etc.): Use the executable path
+        path = Path(sys.executable)  # pragma: no cover
     else:
-        # Standard Python script
-        app_path = Path(__file__)
+        # Standard: Use the object's file path
+        path = Path(inspect.getfile(pyobject))
+
+    # Resolve symlinks if requested, otherwise just make absolute
+    path = path.resolve() if follow_symlinks else path.absolute()
 
-    # .resolve() ensures we follow symlinks to the real folder,
-    # and makes the path absolute so CWD doesn't matter.
-    return app_path.resolve().parent
+    return path.parent
 
 
-def script_dir_plus_file(filename: str, *args, **kwargs) -> Path:
+def script_dir_plus_file(
+    filename: str, pyobject: Any, follow_symlinks: bool = True
+) -> Path:
     """Get current script's directory and then append a filename.
 
     Args:
         filename: Filename to append to directory path
+        pyobject: Any Python object in the script
+        return_path: Whether to return a Path object. Defaults to returning str.
+
+        follow_symlinks: Follow symlinks or not. Defaults to True.
 
     Returns:
-        Current script's directory and with filename appended
+        Current script's directory with filename appended
     """
-    return script_dir() / filename
+    return script_dir(pyobject, follow_symlinks) / filename
 
 
 def get_temp_dir(