Skip to content

Commit

Permalink
Mcknight/backport 58 (#89)
Browse files Browse the repository at this point in the history
* backporting #80 to unstick releases for adapters

* updating dev_requirements and commenting out lines in main.yaml

* adding backport of pr#58 to get rid of testing error based on pr #4512 in dbt-core

* uncommenting to see if we can make pointers of local install and tox install the same

* testing if tox change is all thats needed

* tests failed proving the addition is needed as backport #58

* trying out removal of dbt-core-ref install

* remove white-space

* remove whitespace

* remove trailing whitespace on main.yml
  • Loading branch information
McKnight-42 authored Mar 25, 2022
1 parent 58efd83 commit 940defd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 20 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,6 @@ jobs:
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"
- name: Install dbt-postgres latest
run: |
pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres"
- name: Run tox (redshift)
if: matrix.adapter == 'redshift'
env:
Expand Down Expand Up @@ -219,7 +211,7 @@ jobs:

slack-results:
runs-on: ubuntu-latest
needs: test
needs: test
if: always()

steps:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,6 @@ jobs:
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"
- name: Install dbt-postgres latest
run: |
pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres"
- name: Run tox
run: tox

Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## dbt-redshift 1.0.1 (TBD)

### Fixes

### Under the hood
- install compatible branch of dbt-core in unit/integration tests based on merge target ([#80](https://github.com/dbt-labs/dbt-redshift/pull/80))
- Fix test related to preventing coercion of boolean values (True,False) to numeric values (0,1) in query results ([#58](https://github.com/dbt-labs/dbt-redshift/blob/1.0.latest/CHANGELOG.md))

## dbt-redshift 1.0.0 (December 3, 2021)

## dbt-redshift 1.0.0rc2 (November 24, 2021)
Expand Down
4 changes: 2 additions & 2 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# install latest changes in dbt-core + dbt-postgres
# TODO: how to switch from HEAD to x.y.latest branches after minor releases?
git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres
git+https://github.com/dbt-labs/dbt-core.git@1.0.latest#egg=dbt-core&subdirectory=core
git+https://github.com/dbt-labs/dbt-core.git@1.0.latest#egg=dbt-postgres&subdirectory=plugins/postgres

bumpversion
flake8
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def _get_tester_for(self, column_type):
return agate.TimeDelta()

for instance in agate_helper.DEFAULT_TYPE_TESTER._possible_types:
if type(instance) is column_type:
if isinstance(instance, column_type):
return instance

raise ValueError(f'no tester for {column_type}')
Expand Down

0 comments on commit 940defd

Please sign in to comment.