@@ -127,24 +127,16 @@ jobs:
127
127
with :
128
128
python-version : " 3.11"
129
129
130
- - name : " Upgrade pip"
130
+ - name : " Upgrade pip, install tox "
131
131
run : |
132
132
python -m pip install --upgrade pip
133
133
python -m pip --version
134
+ python -m pip install tox
135
+ tox --version
134
136
135
- # tox takes care of installing the correct version of dbt-core dependencies but we need to
136
- # install them first s that we can override the dbt-common branch
137
- - name : " Manually install dbt-core dependencies"
137
+ - name : " Update dbt-common dependency to ${{ needs.job-prep.outputs.dbt-common-ref }}"
138
138
run : |
139
- python -m pip uninstall dbt-common -y
140
- python -m pip install -r dev-requirements.txt -r editable-requirements.txt
141
-
142
- # Since the dbt-common dependency is pinned in dev-requirements.txt we need to force update it
143
- # Since tox installs dependencies but doesn't force update, it won't get overridden in the next
144
- # step since the requirements will already be met
145
- - name : " Force update the version of dbt-common@${{ needs.job-prep.outputs.dbt-common-ref }}"
146
- run : |
147
- python -m pip install pip install git+https://github.com/dbt-labs/dbt-common.git@${{ needs.job-prep.outputs.dbt-common-ref }} --force-reinstall
139
+ ./scripts/update_dev_packages.sh ${{ github.repository.name}} ${{ needs.job-prep.outputs.dbt-common-ref }}
148
140
149
141
- name : " Run unit tests"
150
142
# Doing the check here instead of the top level because this is job a required check, the
@@ -237,24 +229,16 @@ jobs:
237
229
if : runner.os == 'Windows'
238
230
uses : ./.github/actions/setup-postgres-windows
239
231
240
- - name : " Upgrade pip"
232
+ - name : " Upgrade pip, install tox "
241
233
run : |
242
234
python -m pip install --upgrade pip
243
235
python -m pip --version
236
+ python -m pip install tox
237
+ tox --version
244
238
245
- # tox takes care of installing the correct version of dbt-core dependencies but we need to
246
- # install them first s that we can override the dbt-common branch
247
- - name : " Manually install dbt-core dependencies"
248
- run : |
249
- python -m pip install -r dev-requirements.txt -r editable-requirements.txt
250
-
251
- # Since the dbt-common dependency is pinned in dev-requirements.txt we need to force update it
252
- # Since tox installs dependencies but doesn't force update, it won't get overridden in the next
253
- # step since the requirements will already be met
254
- - name : " Force update the version of dbt-common@${{ needs.job-prep.outputs.dbt-common-ref }}"
239
+ - name : " Update dbt-common dependency to ${{ needs.job-prep.outputs.dbt-common-ref }}"
255
240
run : |
256
- python -m pip uninstall dbt-common -y
257
- python -m pip install pip install git+https://github.com/dbt-labs/dbt-common.git@${{ needs.job-prep.outputs.dbt-common-ref }} --force-reinstall
241
+ ./scripts/update_dev_packages.sh ${{ github.repository.name}} ${{ needs.job-prep.outputs.dbt-common-ref }}
258
242
259
243
- name : " Run Functional tests"
260
244
run : tox -- --ddtrace
0 commit comments