dcicutils 8.8.4.1b18__py3-none-any.whl → 8.8.4.1b20__py3-none-any.whl

dcicutils/file_utils.py

@@ -44,11 +44,12 @@ def search_for_file(file: str,
             directory = str(directory)
         if not (directory := directory.strip()):
             continue
-        if os.path.isfile(directory):
+        if os.path.isfile(directory := os.path.abspath(os.path.normpath(directory))):
             # Allow a file; assume its parent directory was intended.
             if not (directory := os.path.dirname(directory)):
                 continue
-        location_pruned.append(directory)
+        if directory not in location_pruned:
+            location_pruned.append(directory)
     location = location_pruned
     for directory in location:
         if os.path.exists(os.path.join(directory, file)):
@@ -59,8 +60,6 @@ def search_for_file(file: str,
                 files_found.append(file_found)
     if recursive is True:
         for directory in location:
-            if not directory:
-                continue
             if not directory.endswith("/**") and not file.startswith("**/"):
                 path = f"{directory}/**/{file}"
             else:

{dcicutils-8.8.4.1b18.dist-info → dcicutils-8.8.4.1b20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.4.1b18
+Version: 8.8.4.1b20
 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.1b18.dist-info → dcicutils-8.8.4.1b20.dist-info}/RECORD

@@ -28,7 +28,7 @@ dcicutils/es_utils.py,sha256=ZksLh5ei7kRUfiFltk8sd2ZSfh15twbstrMzBr8HNw4,7541
 dcicutils/exceptions.py,sha256=4giQGtpak-omQv7BP6Ckeu91XK5fnDosC8gfdmN_ccA,9931
 dcicutils/ff_mocks.py,sha256=6RKS4eUiu_Wl8yP_8V0CaV75w4ZdWxdCuL1CVlnMrek,36918
 dcicutils/ff_utils.py,sha256=oIhuZPnGtfwj6bWyCc1u23JbMB_6InPp01ZqUOljd8M,73123
-dcicutils/file_utils.py,sha256=GI3DfD11iM4Z76QbZftIJ1e6tWATxFtZ8as-vrlHTps,9139
+dcicutils/file_utils.py,sha256=Z80vdJD438hRIgIw__8emWb-75drGcRlGoYGOw-aCJk,9181
 dcicutils/function_cache_decorator.py,sha256=XMyiEGODVr2WoAQ68vcoX_9_Xb9p8pZXdXl7keU8i2g,10026
 dcicutils/glacier_utils.py,sha256=Q4CVXsZCbP-SoZIsZ5NMcawDfelOLzbQnIlQn-GdlTo,34149
 dcicutils/http_utils.py,sha256=Je5ErNjR5e6lfSXGRncK_lcR_-zP38PIpmHjApy9Wi4,1289
@@ -73,8 +73,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.8.4.1b18.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.4.1b18.dist-info/METADATA,sha256=YbKpFyKttkQQ6Exbw6SfcOkW76dDpxqlJ2DhyBHzTxM,3440
-dcicutils-8.8.4.1b18.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.4.1b18.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.4.1b18.dist-info/RECORD,,
+dcicutils-8.8.4.1b20.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.4.1b20.dist-info/METADATA,sha256=dJrn_TgvyVIDnlFSUa0Ac2hiltJCAUr05WE6GcHPnlA,3440
+dcicutils-8.8.4.1b20.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.4.1b20.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.4.1b20.dist-info/RECORD,,