dcicutils 8.17.0.1b2__py3-none-any.whl → 8.17.0.1b4__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. dcicutils/structured_data.py +2 -0
  2. dcicutils/submitr/custom_excel.py +5 -1
  3. {dcicutils-8.17.0.1b2.dist-info → dcicutils-8.17.0.1b4.dist-info}/METADATA +1 -1
  4. {dcicutils-8.17.0.1b2.dist-info → dcicutils-8.17.0.1b4.dist-info}/RECORD +7 -7
  5. {dcicutils-8.17.0.1b2.dist-info → dcicutils-8.17.0.1b4.dist-info}/LICENSE.txt +0 -0
  6. {dcicutils-8.17.0.1b2.dist-info → dcicutils-8.17.0.1b4.dist-info}/WHEEL +0 -0
  7. {dcicutils-8.17.0.1b2.dist-info → dcicutils-8.17.0.1b4.dist-info}/entry_points.txt +0 -0
dcicutils/structured_data.py CHANGED
@@ -105,11 +105,13 @@ class StructuredDataSet:
105
105
  ref_lookup_strategy: Optional[Callable] = None,
106
106
  ref_lookup_nocache: bool = False,
107
107
  norefs: bool = False, merge: bool = False,
108
+ excel_class: Optional[Excel] = None,
108
109
  progress: Optional[Callable] = None,
109
110
  debug_sleep: Optional[str] = None) -> StructuredDataSet:
110
111
  return StructuredDataSet(file=file, portal=portal, schemas=schemas, autoadd=autoadd, order=order, prune=prune,
111
112
  remove_empty_objects_from_lists=remove_empty_objects_from_lists,
112
113
  ref_lookup_strategy=ref_lookup_strategy, ref_lookup_nocache=ref_lookup_nocache,
114
+ excel_class=excel_class,
113
115
  norefs=norefs, merge=merge, progress=progress, debug_sleep=debug_sleep)
114
116
 
115
117
  def validate(self, force: bool = False) -> None:
dcicutils/submitr/custom_excel.py CHANGED
@@ -87,9 +87,13 @@ COLUMN_NAME_SEPARATOR = "."
87
87
 
88
88
  class CustomExcel(Excel):
89
89
 
90
+ def __init__(self, *args, **kwargs):
91
+ super().__init__(*args, **kwargs)
92
+ self._custom_column_mappings = CustomExcel._get_custom_column_mappings()
93
+
90
94
  def sheet_reader(self, sheet_name: str) -> ExcelSheetReader:
91
95
  return CustomExcelSheetReader(self, sheet_name=sheet_name, workbook=self._workbook,
92
- custom_column_mappings=CustomExcel._get_custom_column_mappings())
96
+ custom_column_mappings=self._custom_column_mappings)
93
97
 
94
98
  def effective_sheet_name(self, sheet_name: str) -> str:
95
99
  if (underscore := sheet_name.find("_")) > 1:
{dcicutils-8.17.0.1b2.dist-info → dcicutils-8.17.0.1b4.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dcicutils
3
- Version: 8.17.0.1b2
3
+ Version: 8.17.0.1b4
4
4
  Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
5
5
  Home-page: https://github.com/4dn-dcic/utils
6
6
  License: MIT
{dcicutils-8.17.0.1b2.dist-info → dcicutils-8.17.0.1b4.dist-info}/RECORD RENAMED
@@ -66,9 +66,9 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
66
66
  dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
67
67
  dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
68
68
  dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
69
- dcicutils/structured_data.py,sha256=ZeVm-okt36tHLT7uRaL3irn3cJTVzMvN7jrYLS5zNSA,67402
69
+ dcicutils/structured_data.py,sha256=9Uleh8AhRWW6qj4fDCUnpRBsLgxWHZVh8nJdMDSHmD0,67510
70
70
  dcicutils/submitr/config/custom_column_mappings.json,sha256=GS6umTpNZszTao8zTbGiNbR8qFnL4kudMt3nBZXaom0,3881
71
- dcicutils/submitr/custom_excel.py,sha256=Ssaz9uQgeeEiaqXlu-4u_4M3KSdNPACKZRDOsJN8Xdk,16431
71
+ dcicutils/submitr/custom_excel.py,sha256=VqAjEAXEjY8nnS-fxCjLPAEhFWHyL5AkKDNGn-Czts0,16583
72
72
  dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
73
73
  dcicutils/submitr/ref_lookup_strategy.py,sha256=VJN-Oo0LLna6Vo2cu47eC-eU-yUC9NFlQP29xajejVU,4741
74
74
  dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
@@ -77,8 +77,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
77
77
  dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
78
78
  dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
79
79
  dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
80
- dcicutils-8.17.0.1b2.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
81
- dcicutils-8.17.0.1b2.dist-info/METADATA,sha256=ACHSCcyKpABSNSnHdYKuBp8XOw-3fxwJ9AfPu11z8iw,3493
82
- dcicutils-8.17.0.1b2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
83
- dcicutils-8.17.0.1b2.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
84
- dcicutils-8.17.0.1b2.dist-info/RECORD,,
80
+ dcicutils-8.17.0.1b4.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
81
+ dcicutils-8.17.0.1b4.dist-info/METADATA,sha256=RZRqBDz4s1vtpIDqCOZvSh6ezCD7PsoAOqB-yfxp-8k,3493
82
+ dcicutils-8.17.0.1b4.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
83
+ dcicutils-8.17.0.1b4.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
84
+ dcicutils-8.17.0.1b4.dist-info/RECORD,,