dcicutils 8.8.4.1b32__tar.gz → 8.8.4.1b34__tar.gz

{dcicutils-8.8.4.1b32 → dcicutils-8.8.4.1b34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.4.1b32
+Version: 8.8.4.1b34
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.8.4.1b32 → dcicutils-8.8.4.1b34}/dcicutils/file_utils.py

@@ -14,7 +14,7 @@ HOME_DIRECTORY = str(pathlib.Path().home())
 
 
 def search_for_file(file: str,
-                    location: Union[str, Optional[List[str]]] = None,
+                    location: Union[str, pathlib.PosixPath, Optional[List[Union[str, pathlib.PosixPath]]]] = None,
                     recursive: bool = False,
                     single: bool = False,
                     order: bool = True) -> Union[List[str], Optional[str]]:
@@ -35,7 +35,7 @@ def search_for_file(file: str,
         return None if single is True else []
     if os.path.isabs(file):
         if os.path.exists(file):
-            return file if single is True else [file]
+            return str(file) if single is True else [str(file)]
         return None if single is True else []
     files_found = []
     if not location:
@@ -53,7 +53,7 @@ def search_for_file(file: str,
         if not (directory := directory.strip()):
             continue
         if os.path.isfile(directory := os.path.abspath(os.path.normpath(directory))):
-            # Allow a file; assume its parent directory was intended.
+            # Actually, allow a file rather then a directory; assume its parent directory was intended.
             if not (directory := os.path.dirname(directory)):
                 continue
         if directory not in location_pruned:

{dcicutils-8.8.4.1b32 → dcicutils-8.8.4.1b34}/dcicutils/misc_utils.py

@@ -2606,7 +2606,11 @@ def format_size(nbytes: Union[int, float], precision: int = 2, nospace: bool = F
         nbytes = int(nbytes)
         return f"{nbytes} byte{'s' if nbytes != 1 else ''}"
     unit = (UNITS_TERSE if terse else UNITS)[index]
-    return f"{nbytes:.{precision}f}{'' if nospace else ' '}{unit}"
+    size = f"{nbytes:.{precision}f}"
+    if size.endswith(f".{'0' * precision}"):
+        # Tidy up extraneous zeros.
+        size = size[:-(precision - 1)]
+    return f"{size}{'' if nospace else ' '}{unit}"
 
 
 def format_duration(seconds: Union[int, float]) -> str:
@@ -2731,3 +2735,6 @@ def create_short_uuid(length: Optional[int] = None, upper: bool = False):
     if upper is True:
         value = value.upper()
     return value
+
+
+print(format_size(1024 * 1024))

{dcicutils-8.8.4.1b32 → dcicutils-8.8.4.1b34}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.8.4.1b32"  # TODO: To become 8.8.5
+version = "8.8.4.1b34"  # TODO: To become 8.8.5
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"