From 4f1229030e5264bc9a4663697edd7e27929c14de Mon Sep 17 00:00:00 2001 From: Harshal Sheth Date: Mon, 17 Mar 2025 10:06:39 -0700 Subject: [PATCH 1/2] fix(ingest): pin lookml liquid dep --- metadata-ingestion/setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py index 7e172ed9cc2bca..592da754258b88 100644 --- a/metadata-ingestion/setup.py +++ b/metadata-ingestion/setup.py @@ -185,7 +185,11 @@ "lkml>=1.3.4", *sqlglot_lib, "GitPython>2", - "python-liquid", + # python-liquid 2 includes a bunch of breaking changes. + # See https://jg-rp.github.io/liquid/migration/ + # Eventually we should fully upgrade to v2, but that will require + # us to drop Python 3.8 support first. + "python-liquid<2", "deepmerge>=1.1.1", } @@ -712,7 +716,7 @@ "mariadb", "redash", "vertica", - "vertexai" + "vertexai", ] if plugin for dependency in plugins[plugin] From 3438d164368bd1a4b59cb9211b494872718c0f24 Mon Sep 17 00:00:00 2001 From: Harshal Sheth Date: Mon, 17 Mar 2025 10:45:11 -0700 Subject: [PATCH 2/2] remove DeltaInfoOperator --- .../src/datahub/testing/mcp_diff.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/metadata-ingestion/src/datahub/testing/mcp_diff.py b/metadata-ingestion/src/datahub/testing/mcp_diff.py index b58afc10148edc..b4f2cd90a45652 100644 --- a/metadata-ingestion/src/datahub/testing/mcp_diff.py +++ b/metadata-ingestion/src/datahub/testing/mcp_diff.py @@ -8,7 +8,6 @@ import yaml from deepdiff import DeepDiff from deepdiff.model import DiffLevel -from deepdiff.operator import BaseOperator from typing_extensions import Literal ReportType = Literal[ @@ -59,27 +58,12 @@ def __repr__(self): @dataclasses.dataclass class DeltaInfo: - """Information about an MCP used to construct a diff delta. - - In a separate class so it can be ignored by DeepDiff via MCPDeltaInfoOperator. - """ + """Information about an MCP used to construct a diff delta.""" idx: int # Location in list of MCEs in golden file original: Dict[str, Any] # Original json-serialized MCP -class DeltaInfoOperator(BaseOperator): - """Warning: Doesn't seem to be working right now. - Ignored via an ignore path as an extra layer of defense. - """ - - def __init__(self): - super().__init__(types=[DeltaInfo]) - - def give_up_diffing(self, *args: Any, **kwargs: Any) -> bool: - return True - - AspectsByUrn = Dict[str, Dict[str, List[AspectForDiff]]] @@ -176,7 +160,6 @@ def create( t2=t2, exclude_regex_paths=ignore_paths, ignore_order=True, - custom_operators=[DeltaInfoOperator()], ) if diff: aspect_changes[urn][aspect_name] = MCPAspectDiff.create(diff)