Skip to content

Commit

Permalink
backport 196 and minor name alignment for dev-requirements (#199)
Browse files Browse the repository at this point in the history
* backport 196 and minor name alignment for dev-requirements

* revert dev_requirements back

* revert all refs to dev-requiremnts to dev_requirements

Co-authored-by: leahwicz <60146280+leahwicz@users.noreply.github.com>
  • Loading branch information
McKnight-42 and leahwicz authored Jun 8, 2022
1 parent 8679a8b commit 90172f2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,14 @@ jobs:

- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip install tox
pip --version
python -m pip install --user --upgrade pip
python -m pip install tox
python -m pip --version
tox --version
- name: Install dbt-core latest
run: |
pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
python -m pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
- name: Run tox (bigquery)
if: matrix.adapter == 'bigquery'
Expand Down
31 changes: 16 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ jobs:

- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip install -r dev_requirements.txt
pip --version
python -m pip install --user --upgrade pip
python -m pip install -r dev_requirements.txt
python -m pip --version
pre-commit --version
mypy --version
dbt --version
Expand Down Expand Up @@ -88,13 +88,13 @@ jobs:

- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip install tox
pip --version
python -m pip install --user --upgrade pip
python -m pip install tox
python -m pip --version
tox --version
- name: Install dbt-core latest
run: |
pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
python -m pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
- name: Run tox
run: tox

Expand Down Expand Up @@ -127,9 +127,10 @@ 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 Down Expand Up @@ -168,9 +169,9 @@ jobs:

- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip install --upgrade wheel
pip --version
python -m pip install --user --upgrade pip
python -m pip install --upgrade wheel
python -m pip --version
- uses: actions/download-artifact@v2
with:
name: dist
Expand All @@ -181,13 +182,13 @@ 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: |
dbt --version
- name: Install source distributions
run: |
find ./dist/*.gz -maxdepth 1 -type f | xargs pip install --force-reinstall --find-links=dist/
find ./dist/*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/
- name: Check source distributions
run: |
dbt --version
4 changes: 2 additions & 2 deletions .github/workflows/version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: |
python3 -m venv env
source env/bin/activate
pip install --upgrade pip
python -m pip install --upgrade pip
- name: Create PR branch
if: ${{ steps.variables.outputs.IS_DRY_RUN == 'true' }}
Expand All @@ -69,7 +69,7 @@ jobs:
- name: Bumping version
run: |
source env/bin/activate
pip install -r dev_requirements.txt
python -m pip install -r dev_requirements.txt
env/bin/bumpversion --allow-dirty --new-version ${{steps.variables.outputs.VERSION_NUMBER}} major
git status
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ If you are a member of the `dbt Labs` GitHub organization, you will have push ac
First make sure that you set up your `virtualenv` as described in [Setting up an environment](https://github.com/dbt-labs/dbt-core/blob/HEAD/CONTRIBUTING.md#setting-up-an-environment). Ensure you have the latest version of pip installed with `pip install --upgrade pip`. Next, install `dbt-bigquery` latest dependencies:

```sh
pip install -e . -r dev-requirements.txt
pip install -e . -r dev_requirements.txt
```

When `dbt-bigquery` is installed this way, any changes you make to the `dbt-bigquery` source code will be reflected immediately in your next `dbt-bigquery` run.
Expand Down

0 comments on commit 90172f2

Please sign in to comment.