dcicutils 8.8.1.1b14__tar.gz → 8.8.1.1b15__tar.gz

{dcicutils-8.8.1.1b14 → dcicutils-8.8.1.1b15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.1.1b14
+Version: 8.8.1.1b15
 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.1.1b14 → dcicutils-8.8.1.1b15}/dcicutils/structured_data.py

@@ -192,7 +192,7 @@ class StructuredDataSet:
         diffs = {}
         if callable(progress):
             ntypes, nobjects = get_counts()
-            progress({PROGRESS.ANALYZE_START.value: True,
+            progress({PROGRESS.ANALYZE_START.value: PROGRESS.NOW(),
                       PROGRESS.ANALYZE_COUNT_TYPES.value: ntypes, PROGRESS.ANALYZE_COUNT_ITEMS.value: nobjects})
         if self.data or self.portal:  # TODO: what is this OR biz?
             refs = self.resolved_refs_with_uuids
@@ -225,7 +225,7 @@ class StructuredDataSet:
                         if callable(progress):
                             progress({PROGRESS.ANALYZE_COUNT_LOOKUP.value: nlookups})
         if callable(progress):
-            progress({PROGRESS.ANALYZE_DONE.value: True})
+            progress({PROGRESS.ANALYZE_DONE.value: PROGRESS.NOW()})
         return diffs
 
     def load_file(self, file: str) -> None:
@@ -272,7 +272,7 @@ class StructuredDataSet:
             return nrows, len(excel.sheet_names)
         if self._progress:  # TODO: Move to _load_reader
             nrows, nsheets = get_counts()
-            self._progress({PROGRESS.LOAD_START.value: True,
+            self._progress({PROGRESS.LOAD_START.value: PROGRESS.NOW(),
                             PROGRESS.LOAD_COUNT_SHEETS.value: nsheets, PROGRESS.LOAD_COUNT_ROWS.value: nrows})
         excel = Excel(file)  # Order the sheet names by any specified ordering (e.g. ala snovault.loadxl).
         order = {Schema.type_name(key): index for index, key in enumerate(self._order)} if self._order else {}

{dcicutils-8.8.1.1b14 → dcicutils-8.8.1.1b15}/pyproject.toml

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