dcicutils 8.17.0.1b2__tar.gz → 8.17.0.1b4__tar.gz

{dcicutils-8.17.0.1b2 → dcicutils-8.17.0.1b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.17.0.1b2
+Version: 8.17.0.1b4
 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.17.0.1b2 → dcicutils-8.17.0.1b4}/dcicutils/structured_data.py

@@ -105,11 +105,13 @@ class StructuredDataSet:
              ref_lookup_strategy: Optional[Callable] = None,
              ref_lookup_nocache: bool = False,
              norefs: bool = False, merge: bool = False,
+             excel_class: Optional[Excel] = None,
              progress: Optional[Callable] = None,
              debug_sleep: Optional[str] = None) -> StructuredDataSet:
         return StructuredDataSet(file=file, portal=portal, schemas=schemas, autoadd=autoadd, order=order, prune=prune,
                                  remove_empty_objects_from_lists=remove_empty_objects_from_lists,
                                  ref_lookup_strategy=ref_lookup_strategy, ref_lookup_nocache=ref_lookup_nocache,
+                                 excel_class=excel_class,
                                  norefs=norefs, merge=merge, progress=progress, debug_sleep=debug_sleep)
 
     def validate(self, force: bool = False) -> None:

{dcicutils-8.17.0.1b2 → dcicutils-8.17.0.1b4}/dcicutils/submitr/custom_excel.py

@@ -87,9 +87,13 @@ COLUMN_NAME_SEPARATOR = "."
 
 class CustomExcel(Excel):
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._custom_column_mappings = CustomExcel._get_custom_column_mappings()
+
     def sheet_reader(self, sheet_name: str) -> ExcelSheetReader:
         return CustomExcelSheetReader(self, sheet_name=sheet_name, workbook=self._workbook,
-                                      custom_column_mappings=CustomExcel._get_custom_column_mappings())
+                                      custom_column_mappings=self._custom_column_mappings)
 
     def effective_sheet_name(self, sheet_name: str) -> str:
         if (underscore := sheet_name.find("_")) > 1:

{dcicutils-8.17.0.1b2 → dcicutils-8.17.0.1b4}/pyproject.toml

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