Skip to content

Commit 0f5f81f

Browse files
committed
Merge origin/main + regenerate baseline on Linux
Resolved conflicts in two files where main's PR #27728 swapped `logger.warning` → `logger.error` while Stage 2c added noqa markers: - ingestion/src/metadata/clients/domo_client.py:168 (TRY201 noqa preserved) - ingestion/src/metadata/ingestion/source/pipeline/spline/utils.py two log blocks (TRY400 noqa preserved on traceback.format_exc lines) Re-ran `ruff check --add-noqa` on the merged files; main's auto-merged warning→error swap introduced 94 new TRY400 violations across data-quality validators which are now grandfathered in line. Regenerated basedpyright baseline in a Linux Docker container so column positions match CI (Ubuntu) exactly. Local macOS arm64 will see column- shifted entries due to stub differences between macOS and Linux wheels; `--baselinemode=discard` mode tolerates the drift downstream. Pinned `pythonPlatform = "Linux"` in pyproject.toml so CI analysis is platform- stable across runners.
2 parents 1d17899 + 1fd724b commit 0f5f81f

74 files changed

Lines changed: 20437 additions & 5743 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ingestion/.basedpyright/baseline.json

Lines changed: 20299 additions & 5611 deletions
Large diffs are not rendered by default.

ingestion/pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ exclude = [
262262
# 3.12 is verified separately by the unit-test matrix in py-tests.yml.
263263
# Keep this in sync with `requires-python` above.
264264
pythonVersion = "3.10"
265+
# Pin platform analysis to Linux so the baseline file (generated against
266+
# CI's Ubuntu runner) matches results from any developer machine. Without
267+
# this, macOS arm64 analyzers resolve some stubs differently and produce
268+
# column-shifted error positions that don't match the committed baseline.
269+
pythonPlatform = "Linux"
265270

266271
# Existing violations are grandfathered via .basedpyright/baseline.json
267272
# (regenerate with `basedpyright -p ingestion/pyproject.toml --writebaseline`

ingestion/src/metadata/clients/domo_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def get_chart_details(self, page_id) -> Optional[DomoChartDetails]: # noqa: UP0
130130
)
131131

132132
except Exception as exc:
133-
logger.warning(f"Error while getting details for Card {page_id} - {exc}")
133+
logger.error(f"Error while getting details for Card {page_id} - {exc}") # noqa: TRY400
134134
logger.debug(traceback.format_exc())
135135

136136
return None
@@ -140,7 +140,7 @@ def get_pipelines(self):
140140
response = self.client.get(path=WORKFLOW_URL, headers=HEADERS)
141141
return response # noqa: RET504, TRY300
142142
except Exception as exc:
143-
logger.warning(f"Error while getting pipelines - {exc}")
143+
logger.error(f"Error while getting pipelines - {exc}") # noqa: TRY400
144144
logger.debug(traceback.format_exc())
145145
return []
146146

@@ -164,7 +164,7 @@ def test_list_cards(self) -> None:
164164
self.client.get(path="content/v1/cards", headers=HEADERS)
165165
except Exception as exc:
166166
logger.debug(traceback.format_exc())
167-
logger.warning(f"Error listing cards due to [{exc}]")
167+
logger.error(f"Error listing cards due to [{exc}]") # noqa: TRY400
168168
raise exc # noqa: TRY201
169169

170170

ingestion/src/metadata/data_quality/validations/column/base/columnValueLengthsToBeBetween.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def _run_validation(self) -> TestCaseResult:
7575
except (ValueError, RuntimeError) as exc:
7676
msg = f"Error computing {self.test_case.fullyQualifiedName}: {exc}" # type: ignore
7777
logger.debug(traceback.format_exc())
78-
logger.warning(msg)
78+
logger.error(msg) # noqa: TRY400
7979
return self.get_test_case_result_object(
8080
self.execution_date,
8181
TestCaseStatus.Aborted,

ingestion/src/metadata/data_quality/validations/column/base/columnValueMaxToBeBetween.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _run_validation(self) -> TestCaseResult:
6868
except (ValueError, RuntimeError) as exc:
6969
msg = f"Error computing {self.test_case.fullyQualifiedName}: {exc}" # type: ignore
7070
logger.debug(traceback.format_exc())
71-
logger.warning(msg)
71+
logger.error(msg) # noqa: TRY400
7272
return self.get_test_case_result_object(
7373
self.execution_date,
7474
TestCaseStatus.Aborted,

ingestion/src/metadata/data_quality/validations/column/base/columnValueMeanToBeBetween.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _run_validation(self) -> TestCaseResult:
6868
except (ValueError, RuntimeError) as exc:
6969
msg = f"Error computing {self.test_case.fullyQualifiedName}: {exc}" # type: ignore
7070
logger.debug(traceback.format_exc())
71-
logger.warning(msg)
71+
logger.error(msg) # noqa: TRY400
7272
return self.get_test_case_result_object(
7373
self.execution_date,
7474
TestCaseStatus.Aborted,

ingestion/src/metadata/data_quality/validations/column/base/columnValueMedianToBeBetween.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _run_validation(self) -> TestCaseResult:
6868
except (ValueError, RuntimeError) as exc:
6969
msg = f"Error computing {self.test_case.fullyQualifiedName}: {exc}" # type: ignore
7070
logger.debug(traceback.format_exc())
71-
logger.warning(msg)
71+
logger.error(msg) # noqa: TRY400
7272
return self.get_test_case_result_object(
7373
self.execution_date,
7474
TestCaseStatus.Aborted,

ingestion/src/metadata/data_quality/validations/column/base/columnValueMinToBeBetween.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def _run_validation(self) -> TestCaseResult:
6565
except (ValueError, RuntimeError) as exc:
6666
msg = f"Error computing {self.test_case.fullyQualifiedName}: {exc}" # type: ignore
6767
logger.debug(traceback.format_exc())
68-
logger.warning(msg)
68+
logger.error(msg) # noqa: TRY400
6969
return self.get_test_case_result_object(
7070
self.execution_date,
7171
TestCaseStatus.Aborted,

ingestion/src/metadata/data_quality/validations/column/base/columnValueStdDevToBeBetween.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def _run_validation(self) -> TestCaseResult:
7070
except (ValueError, RuntimeError) as exc:
7171
msg = f"Error computing {self.test_case.fullyQualifiedName}: {exc}" # type: ignore
7272
logger.debug(traceback.format_exc())
73-
logger.warning(msg)
73+
logger.error(msg) # noqa: TRY400
7474
return self.get_test_case_result_object(
7575
self.execution_date,
7676
TestCaseStatus.Aborted,

ingestion/src/metadata/data_quality/validations/column/base/columnValuesMissingCount.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def _run_validation(self) -> TestCaseResult:
8484
except (ValueError, RuntimeError) as exc:
8585
msg = f"Error computing {self.test_case.fullyQualifiedName}: {exc}" # type: ignore
8686
logger.debug(traceback.format_exc())
87-
logger.warning(msg)
87+
logger.error(msg) # noqa: TRY400
8888
return self.get_test_case_result_object(
8989
self.execution_date,
9090
TestCaseStatus.Aborted,

0 commit comments

Comments
 (0)