From 83de14f7d0c01989ea8cd8eb92de4a715c906325 Mon Sep 17 00:00:00 2001 From: Matteo Ferrando Date: Thu, 9 Feb 2023 10:20:57 -0400 Subject: [PATCH] feat: use dbt-athena-community for athena profile --- .github/actions/setup-local-fal/action.yml | 2 +- .github/workflows/test_integration_cli.yml | 8 +++----- projects/fal/src/fal/packages/dependency_analysis.py | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/actions/setup-local-fal/action.yml b/.github/actions/setup-local-fal/action.yml index 2b4eac446..e17b535fc 100644 --- a/.github/actions/setup-local-fal/action.yml +++ b/.github/actions/setup-local-fal/action.yml @@ -42,7 +42,7 @@ runs: # overwrite for specific adapters if [[ '${{ inputs.adapter }}' == 'athena' ]] then - package=dbt-athena-adapter + package=dbt-athena-community fi if [[ '${{ inputs.dbt }}' == 'latest' ]] diff --git a/.github/workflows/test_integration_cli.yml b/.github/workflows/test_integration_cli.yml index e4875541c..4226f396e 100644 --- a/.github/workflows/test_integration_cli.yml +++ b/.github/workflows/test_integration_cli.yml @@ -214,15 +214,13 @@ jobs: dbt: "1.1.*" - profile: "fal" dbt: "1.2.*" - # dbt-athena-adapter only supports dbt-core==1.0.* for now + # dbt-athena-adapter only supports dbt-core>=1.3 + - profile: "athena" + dbt: "1.0.*" - profile: "athena" dbt: "1.1.*" - profile: "athena" dbt: "1.2.*" - - profile: "athena" - dbt: "1.3.*" - - profile: "athena" - dbt: "1.4.*" # Run only the latest commit pushed to PR concurrency: diff --git a/projects/fal/src/fal/packages/dependency_analysis.py b/projects/fal/src/fal/packages/dependency_analysis.py index 37adee608..039eda576 100644 --- a/projects/fal/src/fal/packages/dependency_analysis.py +++ b/projects/fal/src/fal/packages/dependency_analysis.py @@ -28,7 +28,7 @@ def _get_dbt_packages() -> Iterator[Tuple[str, Optional[str]]]: # the PyPI names instead of the import names). An example distribution info is the following, which # contains both the main exporter of the top-level name (dbt-core) as well as all the packages that # export anything to that namespace: - # {"dbt": ["dbt-core", "dbt-postgres", "dbt-athena-adapter"]} + # {"dbt": ["dbt-core", "dbt-postgres", "dbt-athena-community"]} # # This won't only include dbt.adapters.xxx, but anything that might export anything to the dbt namespace # (e.g. a hypothetical plugin that only exports stuff to dbt.includes.xxx) which in theory would allow us @@ -72,7 +72,7 @@ def _find_fal_extras(package: str) -> set[str]: # This list is different from the one we obtain in _get_dbt_packages # since the names here are the actual import names, not the PyPI names - # (e.g. this one will say athena, and the other one will say dbt-athena-adapter). + # (e.g. this one will say athena, and the other one will say dbt-athena-community). available_dbt_adapters = { module_info.name for module_info in pkgutil.iter_modules(dbt.adapters.__path__)