Merge branch 'zarr-checksum-optimization' of github.com:dandi/dandi-a…

…rchive into zarr-checksum-optimization
dandi · Dec 8, 2022 · 52a8061 · 52a8061
2 parents b275fdd + 34a81b5
commit 52a8061
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dandiapi/zarr/checksums.py b/dandiapi/zarr/checksums.py
@@ -175,7 +175,7 @@ def queue_directory_update(self, key: Path, checksum: ZarrChecksum):
     def queue_removal(self, key: Path, path: Path | str):
         self._get_path(key).paths_to_remove.append(str(path))
 
-    def pop_deepest(self):
+    def pop_deepest(self) -> ZarrChecksumModification:
         """Find the deepest path in the queue, and return it and its children to be updated."""
         _, modification = heapq.heappop(self._heap)
         del self._path_map[modification.path]

diff --git a/dandiapi/zarr/tasks/__init__.py b/dandiapi/zarr/tasks/__init__.py
@@ -136,7 +136,7 @@ def ingest_zarr_archive(
         # Instantiate updater and add files as they come in
         empty = True
         queue = ZarrChecksumModificationQueue()
-        print(f'Fetching files for zarr {zarr.zarr_id}...')
+        logger.info(f'Fetching files for zarr {zarr.zarr_id}...')
         for files in yield_files(bucket=zarr.storage.bucket_name, prefix=zarr.s3_path('')):
             if len(files):
                 empty = False