From 43923f0865d7ff818bfc17e5d61fc3134761c220 Mon Sep 17 00:00:00 2001 From: Matteo Ferrando Date: Mon, 17 Jul 2023 18:34:14 -0400 Subject: [PATCH 1/2] fix: github action comparison error --- .github/workflows/python-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml index 42090f424..267f81fd5 100644 --- a/.github/workflows/python-release.yml +++ b/.github/workflows/python-release.yml @@ -152,7 +152,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v4 - if: inputs.package == dbt-fal + if: inputs.package == 'dbt-fal' with: branch: bump-${{ inputs.package }}-${{ env.publishing_version }} delete-branch: true From 47e66dfb698ec7beec8ad5ea449481fe0462e64f Mon Sep 17 00:00:00 2001 From: Matteo Ferrando Date: Mon, 17 Jul 2023 18:47:55 -0400 Subject: [PATCH 2/2] fix: catch correct exception --- .../src/dbt/adapters/fal_experimental/telemetry/telemetry.py | 4 ++-- projects/adapter/src/fal/dbt/telemetry/telemetry.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/adapter/src/dbt/adapters/fal_experimental/telemetry/telemetry.py b/projects/adapter/src/dbt/adapters/fal_experimental/telemetry/telemetry.py index d3edf1f8a..aefd7a160 100644 --- a/projects/adapter/src/dbt/adapters/fal_experimental/telemetry/telemetry.py +++ b/projects/adapter/src/dbt/adapters/fal_experimental/telemetry/telemetry.py @@ -107,7 +107,7 @@ def dbt_installed_version(): """Returns: dbt version""" try: return pkg_resources.get_distribution("dbt-core").version - except ImportError: + except pkg_resources.DistributionNotFound: return @@ -121,7 +121,7 @@ def fal_installed_version(): """Returns: fal version""" try: return pkg_resources.get_distribution("dbt-fal").version - except ImportError: + except pkg_resources.DistributionNotFound: return diff --git a/projects/adapter/src/fal/dbt/telemetry/telemetry.py b/projects/adapter/src/fal/dbt/telemetry/telemetry.py index 285d92a7b..76c6c358e 100644 --- a/projects/adapter/src/fal/dbt/telemetry/telemetry.py +++ b/projects/adapter/src/fal/dbt/telemetry/telemetry.py @@ -112,7 +112,7 @@ def dbt_installed_version(): """Returns: dbt version""" try: return pkg_resources.get_distribution("dbt-core").version - except ImportError: + except pkg_resources.DistributionNotFound: return @@ -128,7 +128,7 @@ def fal_installed_version(): """Returns: fal version""" try: return pkg_resources.get_distribution("dbt-fal").version - except ImportError: + except pkg_resources.DistributionNotFound: return