From 3503281f5b62e5f0fadc584253b0db279f4862b5 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Fri, 1 Mar 2024 20:46:20 -0500 Subject: [PATCH 1/3] add explicit dependency on sqlparse that used to inherit from core --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a1b63306b..6cfd2823e 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ def _plugin_version() -> str: # Pin to the patch or minor version, and bump in each new minor version of dbt-redshift. "redshift-connector<=2.0.918, >=2.0.913, !=2.0.914", # installed via dbt-core but referenced directly; don't pin to avoid version conflicts with dbt-core + "sqlparse>=0.2.3,<0.5", "agate", ], zip_safe=False, From a2127f66078bebf0e3ef76f9c82be90136249799 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Fri, 1 Mar 2024 20:49:35 -0500 Subject: [PATCH 2/3] update build verification command --- .github/workflows/main.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a76df7e9e..9dd6fade9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,7 +59,7 @@ jobs: python -m pip --version pre-commit --version mypy --version - dbt --version + python -c "import dbt.adapters.redshift" - name: pre-commit hooks run: pre-commit run --all-files --show-diff-on-failure @@ -204,7 +204,7 @@ jobs: - name: Check wheel distributions run: | - dbt --version + python -c "import dbt.adapters.redshift" - name: Install source distributions run: | @@ -212,4 +212,4 @@ jobs: - name: Check source distributions run: | - dbt --version + python -c "import dbt.adapters.redshift" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88942e251..f68eb3320 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ on: package_test_command: description: "Package test command" type: string - default: "dbt --version" + default: "python -c \"import dbt.adapters.redshift\"" required: true test_run: description: "Test run (Publish release as draft)" @@ -92,7 +92,7 @@ on: package_test_command: description: "Package test command" type: string - default: "dbt --version" + default: "python -c \"import dbt.adapters.redshift\"" required: true test_run: description: "Test run (Publish release as draft)" From 2ab27c65c22c769be64d0bb4ea2821d9ac3a3178 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Fri, 1 Mar 2024 21:10:03 -0500 Subject: [PATCH 3/3] remove core installation check since it is no longer installed --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9dd6fade9..c361cb987 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,7 +59,6 @@ jobs: python -m pip --version pre-commit --version mypy --version - python -c "import dbt.adapters.redshift" - name: pre-commit hooks run: pre-commit run --all-files --show-diff-on-failure