Skip to content

Commit

Permalink
Merge pull request #428 from stoutfiles/main
Browse files Browse the repository at this point in the history
Add support for v1.8
  • Loading branch information
jecolvin committed May 16, 2024
2 parents 81da1e4 + de79483 commit d42a0e2
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_lint_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
architecture: "x64"

- name: Install Python packages
run: python -m pip install dbt-snowflake~=1.7.0 sqlfluff-templater-dbt~=2.3.2
run: python -m pip install dbt-snowflake~=1.8.0 sqlfluff-templater-dbt~=2.3.2

- name: Test database connection
run: dbt debug
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_test_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_7_0 # A dbt version supported by both the last release and this one
LAST_RELEASE_SUPPORTED_DBT_VERSION: 1_8_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
Expand Down Expand Up @@ -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", "1_7_0"]
version: ["1_3_0", "1_4_0", "1_5_0", "1_6_0", "1_7_0", "1_8_0"]
runs-on: ubuntu-latest
environment:
name: Approve Integration Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main_lint_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
architecture: "x64"

- name: Install Python packages
run: python -m pip install dbt-snowflake~=1.7.0 sqlfluff-templater-dbt~=2.3.2
run: python -m pip install dbt-snowflake~=1.8.0 sqlfluff-templater-dbt~=2.3.2

- name: Test database connection
run: dbt debug
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main_test_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
matrix:
warehouse: ["snowflake", "bigquery", "postgres"]
version: ["1_3_0", "1_4_0", "1_5_0", "1_6_0", "1_7_0"]
version: ["1_3_0", "1_4_0", "1_5_0", "1_6_0", "1_7_0", "1_8_0"]
runs-on: ubuntu-latest
permissions:
contents: "read"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_docs_on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@v3

- name: Install Python packages
run: python -m pip install dbt-snowflake~=1.7.0
run: python -m pip install dbt-snowflake~=1.8.0

- name: Test database connection
run: dbt debug
Expand Down
2 changes: 1 addition & 1 deletion dbt_project.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "dbt_artifacts"
version: "2.6.2"
config-version: 2
require-dbt-version: [">=1.3.0", "<1.8.0"]
require-dbt-version: [">=1.3.0", "<1.9.0"]
profile: "dbt_artifacts"

clean-targets: # folders to be removed by `dbt clean`
Expand Down
44 changes: 38 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0
dbt-snowflake~=1.8.0

[sqlfluff:indentation]
indent_unit = space
Expand Down Expand Up @@ -114,13 +114,13 @@ commands = sqlfluff fix models --ignore parsing

# Generate docs
[testenv:generate_docs]
deps = dbt-snowflake~=1.7.0
deps = dbt-snowflake~=1.8.0
commands = dbt docs generate --profiles-dir integration_test_project

# Snowflake integration tests
[testenv:integration_snowflake]
changedir = integration_test_project
deps = dbt-snowflake~=1.7.0
deps = dbt-snowflake~=1.8.0
commands =
dbt clean
dbt deps
Expand Down Expand Up @@ -167,10 +167,18 @@ commands =
dbt deps
dbt build --target snowflake

[testenv:integration_snowflake_1_8_0]
changedir = integration_test_project
deps = dbt-snowflake~=1.8.0
commands =
dbt clean
dbt deps
dbt build --target snowflake

# Databricks integration tests
[testenv:integration_databricks]
changedir = integration_test_project
deps = dbt-databricks~=1.7.0
deps = dbt-databricks~=1.8.0
commands =
dbt clean
dbt deps
Expand Down Expand Up @@ -216,10 +224,18 @@ commands =
dbt deps
dbt build --target databricks

[testenv:integration_databricks_1_8_0]
changedir = integration_test_project
deps = dbt-databricks~=1.8.0
commands =
dbt clean
dbt deps
dbt build --target databricks

# Bigquery integration tests
[testenv:integration_bigquery]
changedir = integration_test_project
deps = dbt-bigquery~=1.7.0
deps = dbt-bigquery~=1.8.0
commands =
dbt clean
dbt deps
Expand Down Expand Up @@ -265,6 +281,14 @@ commands =
dbt deps
dbt build --target bigquery --vars '"my_var": "my value"'

[testenv:integration_bigquery_1_8_0]
changedir = integration_test_project
deps = dbt-bigquery~=1.8.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
Expand All @@ -276,7 +300,7 @@ commands =

[testenv:integration_postgres]
changedir = integration_test_project
deps = dbt-postgres~=1.7.0
deps = dbt-postgres~=1.8.0
commands =
dbt clean
dbt deps
Expand Down Expand Up @@ -322,4 +346,12 @@ commands =
dbt deps
dbt build --target postgres

[testenv:integration_postgres_1_8_0]
changedir = integration_test_project
deps = dbt-postgres~=1.7.0
commands =
dbt clean
dbt deps
dbt build --target postgres


0 comments on commit d42a0e2

Please sign in to comment.