fix dbt dependency updated; remove extra python setup call

dbt-labs · Dec 10, 2024 · bd0c4ab · bd0c4ab
1 parent 0273da4
commit bd0c4ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.github/scripts/update_dependencies.sh b/.github/scripts/update_dependencies.sh
@@ -3,8 +3,8 @@ set -e
 
 git_branch=$1
 target_req_file="hatch.toml"
-core_req_sed_pattern="s|dbt-core.git#subdirectory=core|dbt-core.git@${git_branch}#subdirectory=core|g"
-tests_req_sed_pattern="s|dbt-adapters.git#subdirectory=dbt-tests-adapter|dbt-adapters.git@${git_branch}#subdirectory=dbt-tests-adapter|g"
+core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${git_branch}#subdirectory=core|g"
+tests_req_sed_pattern="s|dbt-adapters.git.*#subdirectory=dbt-tests-adapter|dbt-adapters.git@${git_branch}#subdirectory=dbt-tests-adapter|g"
 if [[ "$OSTYPE" == darwin* ]]; then
  # mac ships with a different version of sed that requires a delimiter arg
  sed -i "" "$core_req_sed_pattern" $target_req_file

diff --git a/.github/scripts/update_dev_dependency_branches.sh b/.github/scripts/update_dev_dependency_branches.sh
@@ -6,7 +6,7 @@ dbt_adapters_branch=$1
 dbt_core_branch=$2
 dbt_common_branch=$3
 target_req_file="hatch.toml"
-core_req_sed_pattern="s|dbt-core.git#subdirectory=core|dbt-core.git@${dbt_core_branch}#subdirectory=core|g"
+core_req_sed_pattern="s|dbt-core.git.*#subdirectory=core|dbt-core.git@${dbt_core_branch}#subdirectory=core|g"
 adapters_req_sed_pattern="s|dbt-adapters.git|dbt-adapters.git@${dbt_adapters_branch}|g"
 common_req_sed_pattern="s|dbt-common.git|dbt-common.git@${dbt_common_branch}|g"
 if [[ "$OSTYPE" == darwin* ]]; then

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -198,11 +198,8 @@ jobs:
             ${{ inputs.dbt_common_branch }}
           cat hatch.toml
 
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - uses: pypa/hatch@install
+      - name: Install python dependencies
+        uses: pypa/hatch@install
 
       - run: hatch run integration-tests tests/functional --ddtrace
         env: