From 45d683d7f8ad06eeba58a16200124dc77ede8467 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 12:46:02 +0000 Subject: [PATCH 1/3] Switch Docker build to uv and tighten dbt adapter lower bounds to >=1.8 - Replace pip with uv in Dockerfile to avoid pip's resolution-too-deep error - Bump dbt-core and all adapter lower bounds from >=0.20 to >=1.8 (pre-1.8 is EOL) Co-Authored-By: Itamar Hartstein --- Dockerfile | 4 ++-- pyproject.toml | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2cfa5a61a..ad7948357 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update \ /var/tmp/* COPY . /app -RUN pip install --upgrade pip -RUN pip install --no-cache-dir "/app[all]" +RUN pip install uv +RUN uv pip install --no-cache --system "/app[all]" ENTRYPOINT ["edr"] diff --git a/pyproject.toml b/pyproject.toml index 4b3cb10e8..140479a61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ packages = [{include = "elementary"}] [tool.poetry.dependencies] python = ">=3.10,<3.14" click = ">=7.0,<9.0" -dbt-core = ">=0.20,<2.0.0" +dbt-core = ">=1.8,<2.0.0" requests = ">=2.28.1,<3.0.0" beautifulsoup4 = "<5.0.0" ratelimit = "*" @@ -45,21 +45,21 @@ tabulate = ">= 0.9.0" tenacity = ">=8.0,<10.0" pytz = ">= 2025.1" -dbt-snowflake = {version = ">=0.20,<2.0.0", optional = true} -dbt-bigquery = {version = ">=0.20,<2.0.0", optional = true} -dbt-redshift = {version = ">=0.20,<2.0.0", optional = true} -dbt-postgres = {version = ">=0.20,<2.0.0", optional = true} -dbt-databricks = {version = ">=0.20,<2.0.0", optional = true} -dbt-spark = {version = ">=0.20,<2.0.0", optional = true} -dbt-athena-community = {version = ">=1.6.3,<2.0.0", optional = true} -dbt-trino = {version = ">=1.5.0,<2.0.0", optional = true} -dbt-clickhouse = {version = ">=0.20,<2.0.0", optional = true} -dbt-duckdb = {version = ">=1.5.0,<2.0.0", optional = true} -dbt-dremio = {version = ">=1.5.0,<2.0.0", optional = true} -dbt-fabric = {version = ">=1.4,<2.0.0", optional = true} -dbt-fabricspark = {version = ">=1.4,<2.0.0", optional = true} -dbt-sqlserver = {version = ">=1.4,<2.0.0", optional = true} -dbt-vertica = {version = ">=1.7,<2.0.0", optional = true} +dbt-snowflake = {version = ">=1.8,<2.0.0", optional = true} +dbt-bigquery = {version = ">=1.8,<2.0.0", optional = true} +dbt-redshift = {version = ">=1.8,<2.0.0", optional = true} +dbt-postgres = {version = ">=1.8,<2.0.0", optional = true} +dbt-databricks = {version = ">=1.8,<2.0.0", optional = true} +dbt-spark = {version = ">=1.8,<2.0.0", optional = true} +dbt-athena-community = {version = ">=1.8,<2.0.0", optional = true} +dbt-trino = {version = ">=1.8,<2.0.0", optional = true} +dbt-clickhouse = {version = ">=1.8,<2.0.0", optional = true} +dbt-duckdb = {version = ">=1.8,<2.0.0", optional = true} +dbt-dremio = {version = ">=1.8,<2.0.0", optional = true} +dbt-fabric = {version = ">=1.8,<2.0.0", optional = true} +dbt-fabricspark = {version = ">=1.8,<2.0.0", optional = true} +dbt-sqlserver = {version = ">=1.8,<2.0.0", optional = true} +dbt-vertica = {version = ">=1.8,<2.0.0", optional = true} [tool.poetry.extras] snowflake = ["dbt-snowflake"] bigquery = ["dbt-bigquery"] From 0b36d5fef46f93fbba1da14a52d9f5347696365a Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 13:35:04 +0000 Subject: [PATCH 2/3] Remove dbt-fabricspark from all extra (broken upstream: no installable version >=1.8) Co-Authored-By: Itamar Hartstein --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 140479a61..2e46ba5c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ fabric = ["dbt-fabric"] fabricspark = ["dbt-fabricspark"] sqlserver = ["dbt-sqlserver"] vertica = ["dbt-vertica"] -all = ["dbt-snowflake", "dbt-bigquery", "dbt-redshift", "dbt-postgres", "dbt-databricks", "dbt-spark", "dbt-clickhouse", "dbt-athena-community", "dbt-trino", "dbt-duckdb", "dbt-dremio", "dbt-fabric", "dbt-fabricspark", "dbt-sqlserver", "dbt-vertica"] +all = ["dbt-snowflake", "dbt-bigquery", "dbt-redshift", "dbt-postgres", "dbt-databricks", "dbt-spark", "dbt-clickhouse", "dbt-athena-community", "dbt-trino", "dbt-duckdb", "dbt-dremio", "dbt-fabric", "dbt-sqlserver", "dbt-vertica"] [build-system] requires = ["poetry-core>=1.0.0"] From af89c1d303e797edad1610e2ca4805fb533364f5 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 15:53:55 +0000 Subject: [PATCH 3/3] Pin uv version to 0.10.11 and merge into single RUN layer Co-Authored-By: Itamar Hartstein --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad7948357..4a8520fb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,8 @@ RUN apt-get update \ /var/tmp/* COPY . /app -RUN pip install uv -RUN uv pip install --no-cache --system "/app[all]" +ARG UV_VERSION=0.10.11 +RUN pip install --no-cache-dir "uv==${UV_VERSION}" \ + && uv pip install --no-cache --system "/app[all]" ENTRYPOINT ["edr"]