From deeec8bcfd6462dcbd5bbc2ea878e811dd0f3484 Mon Sep 17 00:00:00 2001 From: Gemma Down <52132406+glsdown@users.noreply.github.com> Date: Thu, 16 Nov 2023 12:34:05 +0000 Subject: [PATCH] Add support for 1.7 (#403) --- .github/workflows/ci_lint_package.yml | 2 +- .github/workflows/ci_test_package.yml | 4 +- .github/workflows/main_lint_package.yml | 2 +- .github/workflows/main_test_package.yml | 2 +- .github/workflows/publish_docs_on_release.yml | 2 +- dbt_project.yml | 2 +- tox.ini | 45 ++++++++++++++++--- 7 files changed, 46 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci_lint_package.yml b/.github/workflows/ci_lint_package.yml index 9f1508f3..2563e0cf 100644 --- a/.github/workflows/ci_lint_package.yml +++ b/.github/workflows/ci_lint_package.yml @@ -50,7 +50,7 @@ jobs: architecture: "x64" - name: Install Python packages - run: python -m pip install dbt-snowflake~=1.6.0 sqlfluff-templater-dbt~=2.3.2 + run: python -m pip install dbt-snowflake~=1.7.0 sqlfluff-templater-dbt~=2.3.2 - name: Test database connection run: dbt debug diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index b02997ee..034a316f 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -21,7 +21,7 @@ env: DBT_ENV_SECRET_DATABRICKS_TOKEN: ${{ secrets.DATABRICKS_TOKEN }} DBT_ENV_SECRET_GCP_PROJECT: ${{ secrets.GCP_PROJECT }} # Env var to test version - LAST_RELEASE_SUPPORTED_DBT_VERSION: 1_6_0 # A dbt version supported by both the last release and this one + LAST_RELEASE_SUPPORTED_DBT_VERSION: 1_7_0 # A dbt version supported by both the last release and this one # Env vars to test invocations model DBT_CLOUD_PROJECT_ID: 123 DBT_CLOUD_JOB_ID: ABC @@ -115,7 +115,7 @@ jobs: matrix: warehouse: ["snowflake", "bigquery", "postgres"] # When supporting a new version, update the list here - version: ["1_3_0", "1_4_0", "1_5_0", "1_6_0"] + version: ["1_3_0", "1_4_0", "1_5_0", "1_6_0", "1_7_0"] runs-on: ubuntu-latest environment: name: Approve Integration Tests diff --git a/.github/workflows/main_lint_package.yml b/.github/workflows/main_lint_package.yml index 7747f565..771d185f 100644 --- a/.github/workflows/main_lint_package.yml +++ b/.github/workflows/main_lint_package.yml @@ -46,7 +46,7 @@ jobs: architecture: "x64" - name: Install Python packages - run: python -m pip install dbt-snowflake~=1.6.0 sqlfluff-templater-dbt~=2.3.2 + run: python -m pip install dbt-snowflake~=1.7.0 sqlfluff-templater-dbt~=2.3.2 - name: Test database connection run: dbt debug diff --git a/.github/workflows/main_test_package.yml b/.github/workflows/main_test_package.yml index 4398c459..c8e503b5 100644 --- a/.github/workflows/main_test_package.yml +++ b/.github/workflows/main_test_package.yml @@ -35,7 +35,7 @@ jobs: strategy: matrix: warehouse: ["snowflake", "bigquery", "postgres"] - version: ["1_3_0", "1_4_0", "1_5_0", "1_6_0"] + version: ["1_3_0", "1_4_0", "1_5_0", "1_6_0", "1_7_0"] runs-on: ubuntu-latest permissions: contents: "read" diff --git a/.github/workflows/publish_docs_on_release.yml b/.github/workflows/publish_docs_on_release.yml index d558a464..b02ee057 100644 --- a/.github/workflows/publish_docs_on_release.yml +++ b/.github/workflows/publish_docs_on_release.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Install Python packages - run: python -m pip install dbt-snowflake~=1.6.0 + run: python -m pip install dbt-snowflake~=1.7.0 - name: Test database connection run: dbt debug diff --git a/dbt_project.yml b/dbt_project.yml index ee9e85ca..7ddce641 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,7 +1,7 @@ name: "dbt_artifacts" version: "2.6.1" config-version: 2 -require-dbt-version: [">=1.3.0", "<1.7.0"] +require-dbt-version: [">=1.3.0", "<1.8.0"] profile: "dbt_artifacts" clean-targets: # folders to be removed by `dbt clean` diff --git a/tox.ini b/tox.ini index 8add76ba..542d6e21 100644 --- a/tox.ini +++ b/tox.ini @@ -36,7 +36,7 @@ rules = LT01,LT02,LT03,CP01,AL01,AL02,CP02,ST08,LT06,LT07,AM01,LT08,AL05,RF02,RF deps = sqlfluff-templater-dbt~=2.0.2 - dbt-snowflake~=1.6.0 + dbt-snowflake~=1.7.0 [sqlfluff:indentation] indent_unit = space @@ -114,13 +114,13 @@ commands = sqlfluff fix models --ignore parsing # Generate docs [testenv:generate_docs] -deps = dbt-snowflake~=1.6.0 +deps = dbt-snowflake~=1.7.0 commands = dbt docs generate --profiles-dir integration_test_project # Snowflake integration tests [testenv:integration_snowflake] changedir = integration_test_project -deps = dbt-snowflake~=1.6.0 +deps = dbt-snowflake~=1.7.0 commands = dbt clean dbt deps @@ -159,10 +159,18 @@ commands = dbt deps dbt build --target snowflake +[testenv:integration_snowflake_1_7_0] +changedir = integration_test_project +deps = dbt-snowflake~=1.7.0 +commands = + dbt clean + dbt deps + dbt build --target snowflake + # Databricks integration tests [testenv:integration_databricks] changedir = integration_test_project -deps = dbt-databricks~=1.6.0 +deps = dbt-databricks~=1.7.0 commands = dbt clean dbt deps @@ -200,10 +208,18 @@ commands = dbt deps dbt build --target databricks +[testenv:integration_databricks_1_7_0] +changedir = integration_test_project +deps = dbt-databricks~=1.7.0 +commands = + dbt clean + dbt deps + dbt build --target databricks + # Bigquery integration tests [testenv:integration_bigquery] changedir = integration_test_project -deps = dbt-bigquery~=1.6.0 +deps = dbt-bigquery~=1.7.0 commands = dbt clean dbt deps @@ -241,6 +257,14 @@ commands = dbt deps dbt build --target bigquery --vars '"my_var": "my value"' +[testenv:integration_bigquery_1_7_0] +changedir = integration_test_project +deps = dbt-bigquery~=1.7.0 +commands = + dbt clean + dbt deps + dbt build --target bigquery --vars '"my_var": "my value"' + # Spark integration test (disabled) [testenv:integration_spark] changedir = integration_test_project @@ -252,7 +276,7 @@ commands = [testenv:integration_postgres] changedir = integration_test_project -deps = dbt-postgres~=1.6.0 +deps = dbt-postgres~=1.7.0 commands = dbt clean dbt deps @@ -290,3 +314,12 @@ commands = dbt deps dbt build --target postgres +[testenv:integration_postgres_1_7_0] +changedir = integration_test_project +deps = dbt-postgres~=1.7.0 +commands = + dbt clean + dbt deps + dbt build --target postgres + +