From 25fe6e197a5f7bf20d1064dd571a31c3c52dd4f0 Mon Sep 17 00:00:00 2001 From: Gemma Down Date: Mon, 11 Sep 2023 13:26:09 +0100 Subject: [PATCH 1/4] Add CI checks for 1.6 --- tox.ini | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 064d234f..2070a7eb 100644 --- a/tox.ini +++ b/tox.ini @@ -151,10 +151,18 @@ commands = dbt deps dbt build --target snowflake +[testenv:integration_snowflake_1_6_0] +changedir = integration_test_project +deps = dbt-snowflake~=1.6.0 +commands = + dbt clean + dbt deps + dbt build --target snowflake + # Databricks integration tests [testenv:integration_databricks] changedir = integration_test_project -deps = dbt-databricks~=1.4.0 +deps = dbt-databricks~=1.6.0 commands = dbt clean dbt deps @@ -184,10 +192,18 @@ commands = dbt deps dbt build --target databricks +[testenv:integration_databricks_1_6_0] +changedir = integration_test_project +deps = dbt-databricks~=1.6.0 +commands = + dbt clean + dbt deps + dbt build --target databricks + # Bigquery integration tests [testenv:integration_bigquery] changedir = integration_test_project -deps = dbt-bigquery~=1.4.0 +deps = dbt-bigquery~=1.6.0 commands = dbt clean dbt deps @@ -217,6 +233,14 @@ commands = dbt deps dbt build --target bigquery --vars '"my_var": "my value"' +[testenv:integration_bigquery_1_6_0] +changedir = integration_test_project +deps = dbt-bigquery~=1.6.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 From b647fbe070684908253fdb4237e5561d3dd5741b Mon Sep 17 00:00:00 2001 From: Gemma Down Date: Mon, 11 Sep 2023 13:28:37 +0100 Subject: [PATCH 2/4] Add databricks tests --- .github/workflows/ci_test_package.yml | 46 ++++++++++++------------- .github/workflows/main_test_package.yml | 26 +++++++------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index edd8cdc9..6f9cc245 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -138,26 +138,26 @@ jobs: run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} # Databricks doesn't like the matrix strategy, so moving back to the old integration testing without versioning - # integration-databricks: - # runs-on: ubuntu-latest - # environment: - # name: Approve Integration Tests - - # steps: - # - name: Checkout - # uses: actions/checkout@v3 - # with: - # ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - - # - uses: actions/setup-python@v4 - # with: - # python-version: '3.8.x' - # architecture: 'x64' - - # - name: Install tox - # run: python3 -m pip install tox - - # - name: Run Databricks Tests - # env: - # DBT_VERSION: '' - # run: tox -e integration_databricks + integration-databricks: + runs-on: ubuntu-latest + environment: + name: Approve Integration Tests + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR + + - uses: actions/setup-python@v4 + with: + python-version: '3.8.x' + architecture: 'x64' + + - name: Install tox + run: python3 -m pip install tox + + - name: Run Databricks Tests + env: + DBT_VERSION: '' + run: tox -e integration_databricks diff --git a/.github/workflows/main_test_package.yml b/.github/workflows/main_test_package.yml index 9aa70ae3..bfe1ed46 100644 --- a/.github/workflows/main_test_package.yml +++ b/.github/workflows/main_test_package.yml @@ -66,20 +66,20 @@ jobs: run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} # Databricks doesn't like the matrix strategy, so moving back to the old integration testing without versioning - # integration-databricks: - # runs-on: ubuntu-latest + integration-databricks: + runs-on: ubuntu-latest - # steps: - # - name: Checkout - # uses: actions/checkout@v3 + steps: + - name: Checkout + uses: actions/checkout@v3 - # - uses: actions/setup-python@v4 - # with: - # python-version: '3.8.x' - # architecture: 'x64' + - uses: actions/setup-python@v4 + with: + python-version: '3.8.x' + architecture: 'x64' - # - name: Install tox - # run: python3 -m pip install tox + - name: Install tox + run: python3 -m pip install tox - # - name: Run Databricks Tests - # run: tox -e integration_databricks + - name: Run Databricks Tests + run: tox -e integration_databricks From da3c79f1b3a8f1107a4f7a6c07f3438208b4e4c4 Mon Sep 17 00:00:00 2001 From: Gemma Down Date: Mon, 11 Sep 2023 13:34:00 +0100 Subject: [PATCH 3/4] Specify linter version --- .github/workflows/ci_lint_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_lint_package.yml b/.github/workflows/ci_lint_package.yml index b7d43a01..111f6357 100644 --- a/.github/workflows/ci_lint_package.yml +++ b/.github/workflows/ci_lint_package.yml @@ -44,7 +44,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - name: Install Python packages - run: python -m pip install dbt-snowflake~=1.6.0 sqlfluff-templater-dbt + run: python -m pip install dbt-snowflake~=1.6.0 sqlfluff-templater-dbt~=2.0.2 - name: Test database connection run: dbt debug From e603ab4b8ed731b11e5b188acc04a51d7a63ac2c Mon Sep 17 00:00:00 2001 From: Gemma Down Date: Mon, 11 Sep 2023 13:44:08 +0100 Subject: [PATCH 4/4] Remove databricks --- .github/workflows/ci_test_package.yml | 46 ++++++++++++------------- .github/workflows/main_test_package.yml | 26 +++++++------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci_test_package.yml b/.github/workflows/ci_test_package.yml index 6f9cc245..edd8cdc9 100644 --- a/.github/workflows/ci_test_package.yml +++ b/.github/workflows/ci_test_package.yml @@ -138,26 +138,26 @@ jobs: run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} # Databricks doesn't like the matrix strategy, so moving back to the old integration testing without versioning - integration-databricks: - runs-on: ubuntu-latest - environment: - name: Approve Integration Tests - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR - - - uses: actions/setup-python@v4 - with: - python-version: '3.8.x' - architecture: 'x64' - - - name: Install tox - run: python3 -m pip install tox - - - name: Run Databricks Tests - env: - DBT_VERSION: '' - run: tox -e integration_databricks + # integration-databricks: + # runs-on: ubuntu-latest + # environment: + # name: Approve Integration Tests + + # steps: + # - name: Checkout + # uses: actions/checkout@v3 + # with: + # ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR + + # - uses: actions/setup-python@v4 + # with: + # python-version: '3.8.x' + # architecture: 'x64' + + # - name: Install tox + # run: python3 -m pip install tox + + # - name: Run Databricks Tests + # env: + # DBT_VERSION: '' + # run: tox -e integration_databricks diff --git a/.github/workflows/main_test_package.yml b/.github/workflows/main_test_package.yml index bfe1ed46..9aa70ae3 100644 --- a/.github/workflows/main_test_package.yml +++ b/.github/workflows/main_test_package.yml @@ -66,20 +66,20 @@ jobs: run: tox -e integration_${{ matrix.warehouse }}_${{ matrix.version }} # Databricks doesn't like the matrix strategy, so moving back to the old integration testing without versioning - integration-databricks: - runs-on: ubuntu-latest + # integration-databricks: + # runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 + # steps: + # - name: Checkout + # uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.8.x' - architecture: 'x64' + # - uses: actions/setup-python@v4 + # with: + # python-version: '3.8.x' + # architecture: 'x64' - - name: Install tox - run: python3 -m pip install tox + # - name: Install tox + # run: python3 -m pip install tox - - name: Run Databricks Tests - run: tox -e integration_databricks + # - name: Run Databricks Tests + # run: tox -e integration_databricks