Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix pip upgrade step in CI for windows #5320

Merged
merged 2 commits into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changes/unreleased/Under the Hood-20220601-105245.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
kind: Under the Hood
body: Fix pip upgrade step in CI for Windows
time: 2022-06-01T10:52:45.872931-04:00
custom:
Author: gshank
Issue: "5321"
PR: "5320"
38 changes: 19 additions & 19 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ jobs:

- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip --version
pip install pre-commit
python -m pip install --user --upgrade pip
python -m pip --version
python -m pip install pre-commit
pre-commit --version
pip install mypy==0.942
python -m pip install mypy==0.942
mypy --version
pip install -r requirements.txt
pip install -r dev-requirements.txt
python -m pip install -r requirements.txt
python -m pip install -r dev-requirements.txt
dbt --version

- name: Run pre-commit hooks
Expand All @@ -69,7 +69,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ["3.7", "3.8", "3.9", "3.10"]

env:
TOXENV: "unit"
Expand All @@ -86,9 +86,9 @@ jobs:

- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip --version
pip install tox
python -m pip install --user --upgrade pip
python -m pip --version
python -m pip install tox
tox --version

- name: Run tox
Expand All @@ -113,7 +113,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ["3.7", "3.8", "3.9", "3.10"]
os: [ubuntu-latest]
include:
- python-version: 3.8
Expand Down Expand Up @@ -149,9 +149,9 @@ jobs:

- name: Install python tools
run: |
pip install --user --upgrade pip
pip --version
pip install tox
python -m pip install --user --upgrade pip
python -m pip --version
python -m pip install tox
tox --version

- name: Run tests
Expand Down Expand Up @@ -190,9 +190,9 @@ jobs:

- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip install --upgrade setuptools wheel twine check-wheel-contents
pip --version
python -m pip install --user --upgrade pip
python -m pip install --upgrade setuptools wheel twine check-wheel-contents
python -m pip --version

- name: Build distributions
run: ./scripts/build-dist.sh
Expand All @@ -210,7 +210,7 @@ jobs:

- name: Install wheel distributions
run: |
find ./dist/*.whl -maxdepth 1 -type f | xargs pip install --force-reinstall --find-links=dist/
find ./dist/*.whl -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/

- name: Check wheel distributions
run: |
Expand All @@ -219,7 +219,7 @@ jobs:
- name: Install source distributions
# ignore dbt-1.0.0, which intentionally raises an error when installed from source
run: |
find ./dist/dbt-[a-z]*.gz -maxdepth 1 -type f | xargs pip install --force-reinstall --find-links=dist/
find ./dist/dbt-[a-z]*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/

- name: Check source distributions
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ endif
.PHONY: dev
dev: ## Installs dbt-* packages in develop mode along with development dependencies.
@\
pip install -r dev-requirements.txt -r editable-requirements.txt && \
pip install -r dev-requirements.txt -r editable-requirements.txt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kwigley any reason why this isn't python -m pip?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added that because it fixes an error I introduced a week ago (dangling & ). It's not actually used by CI.


.PHONY: mypy
mypy: .env ## Runs mypy against staged changes for static type checking.
Expand Down