dcicutils 8.16.6.1b5__tar.gz → 8.17.0__tar.gz

{dcicutils-8.16.6.1b5 → dcicutils-8.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.16.6.1b5
+Version: 8.17.0
 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.16.6.1b5 → dcicutils-8.17.0}/dcicutils/structured_data.py

@@ -322,14 +322,14 @@ class StructuredDataSet:
         for sheet_name in sorted(excel.sheet_names, key=lambda key: order.get(Schema.type_name(key), sys.maxsize)):
             # This effective_sheet_name function added 2025-01-21 to allow sheets whose sheet names are
             # other than simply the name of the type, but which do contain that type somehow; i.e. e.g.
-            # specifically where the sheet name is like "DSA:ExternalQualityMetric" where the "DSA"
+            # specifically where the sheet name is like "DSA_ExternalQualityMetric" where the "DSA"
             # part is purely informational, and the "ExternalQualityMetric" is the type name; so we
             # now can have multiple sheets of the same type (impossible before as sheet names need
             # to be unique); this is simply a mechanism to allow the user to partition/organize their
             # sheets with some data/rows for a given type split across multiple actual sheets.
-            type_name = Schema.type_name(excel.effective_sheet_name(sheet_name))
+            effective_sheet_name = excel.effective_sheet_name(sheet_name)
+            type_name = Schema.type_name(effective_sheet_name)
             self._load_reader(excel.sheet_reader(sheet_name), type_name=type_name)
-            # self._load_reader(excel.sheet_reader(sheet_name), type_name=Schema.type_name(sheet_name))
             if self._validator_sheet_hook and self.data.get(sheet_name):
                 self._validator_sheet_hook(self, sheet_name, self.data[sheet_name])
         # TODO: Do we really need progress reporting for the below?

{dcicutils-8.16.6.1b5 → dcicutils-8.17.0}/pyproject.toml

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