diff --git a/.github/workflows/ci-default.yml b/.github/workflows/ci-default.yml index eaed2b3ff..c6b19edf5 100644 --- a/.github/workflows/ci-default.yml +++ b/.github/workflows/ci-default.yml @@ -100,7 +100,7 @@ jobs: uses: packetcoders/action-setup-cache-python-poetry@main with: python-version: 3.12 - poetry-version: 1.7.1 + poetry-version: 1.8.2 - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 diff --git a/.github/workflows/deploy-dbt-docs.yml b/.github/workflows/deploy-dbt-docs.yml index a77d2da22..e3b2b6102 100644 --- a/.github/workflows/deploy-dbt-docs.yml +++ b/.github/workflows/deploy-dbt-docs.yml @@ -46,7 +46,7 @@ jobs: uses: packetcoders/action-setup-cache-python-poetry@main with: python-version: 3.12 - poetry-version: 1.7.1 + poetry-version: 1.8.2 - name: Login to google uses: "google-github-actions/auth@v2" diff --git a/.github/workflows/deploy-hasura.yml b/.github/workflows/deploy-hasura.yml index da2b68af7..4d84ede7c 100644 --- a/.github/workflows/deploy-hasura.yml +++ b/.github/workflows/deploy-hasura.yml @@ -49,7 +49,7 @@ jobs: uses: packetcoders/action-setup-cache-python-poetry@main with: python-version: 3.12 - poetry-version: 1.7.1 + poetry-version: 1.8.2 - name: Login to google uses: 'google-github-actions/auth@v2' diff --git a/.github/workflows/test-deploy/action.yml b/.github/workflows/test-deploy/action.yml index d273b4d32..efac49c87 100644 --- a/.github/workflows/test-deploy/action.yml +++ b/.github/workflows/test-deploy/action.yml @@ -61,7 +61,7 @@ runs: uses: packetcoders/action-setup-cache-python-poetry@main with: python-version: 3.12 - poetry-version: 1.7.1 + poetry-version: 1.8.2 - name: Install poetry deps in the pr-clone shell: bash diff --git a/.github/workflows/warehouse-run-data-pipeline.yml b/.github/workflows/warehouse-run-data-pipeline.yml index 2a49ea99d..f65237048 100644 --- a/.github/workflows/warehouse-run-data-pipeline.yml +++ b/.github/workflows/warehouse-run-data-pipeline.yml @@ -63,7 +63,7 @@ jobs: uses: packetcoders/action-setup-cache-python-poetry@main with: python-version: 3.12 - poetry-version: 1.7.1 + poetry-version: 1.8.2 - name: Run poetry install run: | diff --git a/.sqlfluff b/.sqlfluff index 6cb7162d4..b365e191f 100644 --- a/.sqlfluff +++ b/.sqlfluff @@ -4,6 +4,7 @@ templater = dbt runaway_limit = 10 max_line_length = 80 indent_unit = space +exclude_rules = AL09 [sqlfluff:indentation] tab_space_size = 4 diff --git a/poetry.lock b/poetry.lock index 159c86925..1aa79912a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4658,13 +4658,13 @@ sqlcipher = ["sqlcipher3_binary"] [[package]] name = "sqlfluff" -version = "2.3.5" +version = "3.0.7" description = "The SQL Linter for Humans" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "sqlfluff-2.3.5-py3-none-any.whl", hash = "sha256:2ca095a2f2cced5573a83fc8a6d2aceb36edd21a8c4c5d8099b6544e386d86a1"}, - {file = "sqlfluff-2.3.5.tar.gz", hash = "sha256:fd77ef5a41ebfa798235a5b28bcfa71f7521e9336159a08b40b545953e84c3c3"}, + {file = "sqlfluff-3.0.7-py3-none-any.whl", hash = "sha256:82c9cb9ea4a67ac0d69540af214e39d7e4dc63d92922bc164d526dae1e08ee02"}, + {file = "sqlfluff-3.0.7.tar.gz", hash = "sha256:d49b52c4577ce113ef6318a933c7a7fedd25852dea5e9fe0981cf301c6b73927"}, ] [package.dependencies] @@ -4680,17 +4680,16 @@ pyyaml = ">=5.1" regex = "*" tblib = "*" tqdm = "*" -typing-extensions = "*" [[package]] name = "sqlfluff-templater-dbt" -version = "2.3.5" +version = "3.0.7" description = "Lint your dbt project SQL" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "sqlfluff-templater-dbt-2.3.5.tar.gz", hash = "sha256:11bf500d44e928ac17482eb59375402039e8472b53903ad4e1096b66c9c1cdf3"}, - {file = "sqlfluff_templater_dbt-2.3.5-py3-none-any.whl", hash = "sha256:8970bbc84147f42027c3a675fc05a2b84e588f85e0809946542023a973a970fa"}, + {file = "sqlfluff_templater_dbt-3.0.7-py3-none-any.whl", hash = "sha256:3c977b3973396438ba132df64e8a90f2b04003834d2326638f8719fcdc78a13f"}, + {file = "sqlfluff_templater_dbt-3.0.7.tar.gz", hash = "sha256:d3affd65a3c0a809df9955f5cc29d948c0e9828aa7c21818946731812d4967b6"}, ] [package.dependencies] @@ -4700,7 +4699,7 @@ markupsafe = "*" pydantic = "*" rich = "*" "ruamel.yaml" = "*" -sqlfluff = "2.3.5" +sqlfluff = "3.0.7" [[package]] name = "sqlglot" @@ -5565,4 +5564,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = "^3.11,<3.13" -content-hash = "1e01b312081259219ce28f0581b217764726bce4347e2ed4cb52ef466df57d6f" +content-hash = "5c21b4835da7087434226e0d0c26a3818fcaa9a51496935212324110cb224c90" diff --git a/pyproject.toml b/pyproject.toml index 0559d1a00..41b26f55d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ sqlalchemy = "^2.0.25" google-cloud-storage = "^2.14.0" python-dotenv = "^1.0.1" dbt-bigquery = "^1.7.0" +dbt-core = "^1.8.2" textual = "^0.52.1" google-cloud-service-management = "^1.8.3" google-cloud-resource-manager = "^1.12.3" @@ -40,7 +41,6 @@ polars = "^0.20.23" requests = "^2.31.0" dagster-postgres = "^0.23.6" pytest = "^8.2.1" -dbt-core = "^1.8.2" [tool.poetry.scripts] @@ -49,8 +49,8 @@ oso_lets_go = 'oso_lets_go.wizard:run' [tool.poetry.group.dev.dependencies] ipython = "^8.21.0" -sqlfluff = "^2.3.5" -sqlfluff-templater-dbt = "^2.3.5" +sqlfluff = "^3.0.7" +sqlfluff-templater-dbt = "^3.0.7" shandy-sqlfmt = { extras = ["jinjafmt"], version = "^0.21.1" } dagster-webserver = "^1.7.2"