From 40703d228bf44747c50738bf524883c7fa6dc0a7 Mon Sep 17 00:00:00 2001 From: Cortland Goffena <30168413+cmgoffena13@users.noreply.github.com> Date: Thu, 20 Aug 2026 18:47:17 -0600 Subject: [PATCH 1/2] fix(makefile): exclude web install for dbt 1.6 to fix test Signed-off-by: Cortland Goffena <30168413+cmgoffena13@users.noreply.github.com> Co-authored-by: Cursor --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 300d96dc06..3edd6066ef 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,12 @@ install-dev-dbt-%: echo "Applying numpy<2 constraint for dbt $$version"; \ $(SED_INPLACE) 's/"numpy"/"numpy<2"/g' pyproject.toml; \ fi; \ - $(MAKE) install-dev; \ + if [ "$$version" = "1.6.0" ]; then \ + echo "Installing without web/lsp for dbt 1.6.0 (fastapi>=0.136 needs pydantic v2; dbt 1.6 needs pydantic v1)"; \ + $(PIP) install -e ".[dev,slack,dlt]" ./examples/custom_materializations; \ + else \ + $(MAKE) install-dev; \ + fi; \ if [ "$$version" = "1.6.0" ]; then \ echo "Applying overrides for dbt 1.6.0"; \ $(PIP) install 'pydantic>=2.0.0' 'google-cloud-bigquery==3.30.0' 'databricks-sdk==0.28.0' \ From 686b85968b78f9f20183beea30f8fd32454bcc3e Mon Sep 17 00:00:00 2001 From: Cortland Goffena <30168413+cmgoffena13@users.noreply.github.com> Date: Thu, 20 Aug 2026 19:03:16 -0600 Subject: [PATCH 2/2] fix(pr): test ignores lsp and web for dbt 1.6 Signed-off-by: Cortland Goffena <30168413+cmgoffena13@users.noreply.github.com> --- .github/workflows/pr.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 8759bd484c..9e17e515d8 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -514,7 +514,12 @@ jobs: echo "DBT version is ${{ matrix.dbt-version }} (>= 1.6.0), keeping semantic_models and metrics sections" fi - make dbt-fast-test + # dbt 1.6 installs without web/lsp (pydantic conflict); skip collecting those tests + if [[ "${{ matrix.dbt-version }}" == "1.6" ]]; then + pytest -n auto -m "dbt and fast" --reruns 3 --ignore=tests/lsp --ignore=tests/web + else + make dbt-fast-test + fi - name: Test SQLMesh info in sushi_dbt working-directory: ./examples/sushi_dbt run: |