dcicutils 8.16.6.1b5__py3-none-any.whl → 8.16.6.1b6__py3-none-any.whl

dcicutils/structured_data.py

@@ -327,9 +327,9 @@ class StructuredDataSet:
             # 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.dist-info → dcicutils-8.16.6.1b6.dist-info}/METADATA

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

@@ -66,7 +66,7 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=PMrW-bBnuULzBTyl5D7FM1r83rC6P5xAoFHUUqks6_A,67450
+dcicutils/structured_data.py,sha256=Sys0lgHIN8Zv28PhwYz5taL7EXSMfeaGcr0JwVNvyz8,67402
 dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
 dcicutils/submitr/ref_lookup_strategy.py,sha256=VJN-Oo0LLna6Vo2cu47eC-eU-yUC9NFlQP29xajejVU,4741
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
@@ -75,8 +75,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.16.6.1b5.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
-dcicutils-8.16.6.1b5.dist-info/METADATA,sha256=9feHP-Akh4ZI7EexBuKGCZ7G3x2I3ITQdMEaz3ESQYo,3493
-dcicutils-8.16.6.1b5.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.16.6.1b5.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.16.6.1b5.dist-info/RECORD,,
+dcicutils-8.16.6.1b6.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
+dcicutils-8.16.6.1b6.dist-info/METADATA,sha256=qfnPzqrHqPwYsYvYJsP2zarLjDVCAT2rgAs0LoAGobc,3493
+dcicutils-8.16.6.1b6.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.16.6.1b6.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.16.6.1b6.dist-info/RECORD,,