Skip to content

Commit

Permalink
[BACKPORT] #403 to 1.1.latest (#521)
Browse files Browse the repository at this point in the history
* backport pr #403 to 1.1.latest, todo backport #405

* add changes from #405 to backport

* typo fix

* dev_requirements name fix

* remove ref to pre-commit as doesn't exist in this branch

* add skip that was missing on base test

Co-authored-by: leahwicz <[email protected]>
  • Loading branch information
McKnight-42 and leahwicz committed Nov 17, 2022
1 parent 673527e commit a400fe0
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
51 changes: 25 additions & 26 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ on:
push:
branches:
- "main"
- "develop"
- "*.latest"
- "releases/*"
pull_request:
Expand All @@ -40,6 +39,7 @@ jobs:
name: ${{ matrix.toxenv }}

runs-on: ubuntu-latest
timeout-minutes: 10

strategy:
fail-fast: false
Expand All @@ -58,28 +58,30 @@ jobs:

- name: Set up Python
uses: actions/setup-python@v2
with:
with:
python-version: '3.8'

- name: Install python dependencies
run: |
sudo apt-get install libsasl2-dev
pip install --user --upgrade pip
pip install tox
pip --version
tox --version
- name: Run tox
run: tox
python -m pip install --user --upgrade pip
python -m pip --version
python -m pip install mypy==0.942
mypy --version
python -m pip install -r requirements.txt
python -m pip install -r dev_requirements.txt
dbt --version
unit:
name: unit test / python ${{ matrix.python-version }}

runs-on: ubuntu-latest
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8] # TODO: support unit testing for python 3.9 (https://github.com/dbt-labs/dbt/issues/3689)
python-version: ["3.7", "3.8", "3.9", "3.10"]

env:
TOXENV: "unit"
Expand All @@ -88,8 +90,6 @@ jobs:
steps:
- name: Check out the repository
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
Expand All @@ -99,9 +99,9 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install libsasl2-dev
pip install --user --upgrade pip
pip install tox
pip --version
python -m pip install --user --upgrade pip
python -m pip --version
python -m pip install tox
tox --version
- name: Run tox
run: tox
Expand All @@ -128,8 +128,6 @@ jobs:
steps:
- name: Check out the repository
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Set up Python
uses: actions/setup-python@v2
Expand All @@ -138,9 +136,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 All @@ -153,7 +152,7 @@ jobs:
- name: Check wheel contents
run: |
check-wheel-contents dist/*.whl --ignore W007,W008
- name: Check if this is an alpha version
id: check-is-alpha
run: |
Expand All @@ -179,7 +178,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7, 3.8, 3.9]
python-version: ["3.7", "3.8", "3.9", "3.10"]

steps:
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -189,9 +188,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 @@ -202,13 +201,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
1 change: 1 addition & 0 deletions tests/functional/adapter/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,6 @@ def project_config_update(self):
}
}

@pytest.mark.skip_profile('spark_session')
class TestBaseAdapterMethod(BaseAdapterMethod):
pass

0 comments on commit a400fe0

Please sign in to comment.