Skip to content

Commit 37fcce5

Browse files
authored
Chore: lift pydantic <2.6.0 dev version pin (#3730)
1 parent cc0653c commit 37fcce5

File tree

4 files changed

+29
-5
lines changed

4 files changed

+29
-5
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"pandas-stubs",
8383
"pre-commit",
8484
"psycopg2-binary",
85-
"pydantic<2.6.0",
85+
"pydantic",
8686
"PyAthena[Pandas]",
8787
"PyGithub",
8888
"pyspark~=3.5.0",

tests/core/test_context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ def test_get_model_mixed_dialects(copy_to_temp_path):
10721072
model = load_sql_based_model(expression, default_catalog=context.default_catalog)
10731073
context.upsert_model(model)
10741074

1075-
assert context.get_model("sushi.snowflake_dialect") == model
1075+
assert context.get_model("sushi.snowflake_dialect").dict() == model.dict()
10761076

10771077

10781078
def test_override_dialect_normalization_strategy():

tests/core/test_model.py

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,29 @@ def test_json_serde():
534534

535535
deserialized_model = SqlModel.parse_raw(model_json)
536536

537-
assert deserialized_model == model
537+
assert deserialized_model.dict() == model.dict()
538+
539+
expressions = parse(
540+
"""
541+
MODEL (
542+
name test_model,
543+
kind FULL,
544+
dialect duckdb,
545+
);
546+
547+
SELECT
548+
x ~ y AS c
549+
"""
550+
)
551+
552+
model = load_sql_based_model(expressions)
553+
model_json = model.json()
554+
model_json_parsed = json.loads(model.json())
555+
556+
assert (
557+
SqlModel.parse_obj(model_json_parsed).render_query().sql("duckdb")
558+
== 'SELECT REGEXP_MATCHES("x", "y") AS "c"'
559+
)
538560

539561

540562
def test_scd_type_2_by_col_serde():

tests/schedulers/airflow/test_client.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ def test_get_environment(mocker: MockerFixture, snapshot: Snapshot):
291291
client = AirflowClient(airflow_url=common.AIRFLOW_LOCAL_URL, session=requests.Session())
292292
result = client.get_environment("dev")
293293

294-
assert result == environment
294+
assert result is not None
295+
assert result.dict() == environment.dict()
295296

296297
get_environment_mock.assert_called_once_with(
297298
"http://localhost:8080/sqlmesh/api/v1/environments/dev"
@@ -318,7 +319,8 @@ def test_get_environments(mocker: MockerFixture, snapshot: Snapshot):
318319
client = AirflowClient(airflow_url=common.AIRFLOW_LOCAL_URL, session=requests.Session())
319320
result = client.get_environments()
320321

321-
assert result == [environment]
322+
assert len(result) == 1
323+
assert result[0].dict() == environment.dict()
322324

323325
get_environments_mock.assert_called_once_with(
324326
"http://localhost:8080/sqlmesh/api/v1/environments"

0 commit comments

Comments
 (0)