Skip to content

Commit

Permalink
update code pylint and flake8
Browse files Browse the repository at this point in the history
  • Loading branch information
sliu008 committed Aug 15, 2024
1 parent 3cea513 commit cec2a89
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions podaac/merger/preprocess_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,10 @@ def _run_multi_core(file_list: list[Path],
if var_info is None:
var_info = result['var_info']
elif var_info != result['var_info']:
if set(var_info.keys()).difference(result['var_info']):
# If not all variables match, only compare variables that intersect
intersecting_vars = set(var_info).intersection(result['var_info'])
if list(
map(var_info.get, intersecting_vars)
) != list(map(result['var_info'].get, intersecting_vars)):
raise RuntimeError('Variable schemas are inconsistent between granules')
var_info.update(result['var_info'])
intersecting_vars = set(var_info).intersection(result['var_info'])
if any(var_info[var] != result['var_info'][var] for var in intersecting_vars):
raise RuntimeError('Variable schemas are inconsistent between granules')
var_info.update(result['var_info'])

# The following data requires accumulation methods
merge_max_dims(max_dims, result['max_dims'])
Expand All @@ -259,6 +255,8 @@ def _run_multi_core(file_list: list[Path],
default=str
)

print(var_info)

return {
'group_list': group_list,
'max_dims': max_dims,
Expand Down

0 comments on commit cec2a89

Please sign in to comment.