Skip to content

Commit

Permalink
Merge branch 'master' into jerco/migrate-dbt-common-adapters-interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
jwills authored May 8, 2024
2 parents 298f27c + 21bec27 commit 08d5530
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,14 @@ jobs:
path: filebased_results.csv

check-md-token:
name: Check if MotherDuck token exists
name: Check if MotherDuck v0.10.x token exists
runs-on: ubuntu-latest
outputs:
exists: ${{ steps.md-token.outputs.exists }}
steps:
- id: md-token
env:
MOTHERDUCK_TOKEN: ${{ secrets.MOTHERDUCK_TOKEN }}
MOTHERDUCK_TOKEN: ${{ secrets.MOTHERDUCK_TOKEN_10 }}
if: ${{ env.MOTHERDUCK_TOKEN != '' }}
run: echo "::set-output name=exists::true"

Expand All @@ -226,7 +226,7 @@ jobs:

env:
TOXENV: "md"
MOTHERDUCK_TOKEN: ${{ secrets.MOTHERDUCK_TOKEN }}
MOTHERDUCK_TOKEN: ${{ secrets.MOTHERDUCK_TOKEN_10 }}
PYTEST_ADDOPTS: "-v --color=yes --csv motherduck_results.csv"

steps:
Expand Down Expand Up @@ -362,7 +362,7 @@ jobs:

env:
TOXENV: "plugins"
MOTHERDUCK_TOKEN: ${{ secrets.MOTHERDUCK_TOKEN }}
MOTHERDUCK_TOKEN: ${{ secrets.MOTHERDUCK_TOKEN_10 }}
PYTEST_ADDOPTS: "-v --color=yes --csv plugins_results.csv"

steps:
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,10 @@ them from the database first.
#### Reading from external files

You may reference external files in your dbt models either directly or as dbt `source`s by configuring the `external_location`
meta option on the source:
in either the `meta` or the `config` option on the source definition. The difference is that settings under the `meta` option
will be propagated to the documentation for the source generated via `dbt docs generate`, but the settings under the `config`
option will not be. Any source settings that should be excluded from the docs should be specified via `config`, while any
options that you would like to be included in the generated documentation should live under `meta`.

```
sources:
Expand Down Expand Up @@ -244,7 +247,7 @@ sources:
tables:
- name: source1
- name: source2
meta:
config:
external_location: "read_parquet(['s3://my-bucket/my-sources/source2a.parquet', 's3://my-bucket/my-sources/source2b.parquet'])"
```

Expand All @@ -270,7 +273,7 @@ sources:
- name: flights_source
tables:
- name: flights
meta:
config:
external_location: "read_csv('flights.csv', types={'FlightDate': 'DATE'}, names=['FlightDate', 'UniqueCarrier'])"
formatter: oldstyle
```
Expand Down
2 changes: 1 addition & 1 deletion dbt/adapters/duckdb/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "1.7.4"
version = "1.7.5"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def _dbt_duckdb_version():
# add dbt-core to ensure backwards compatibility of installation, this is not a functional dependency
"dbt-core>=1.8.0b1",
],
extras_require={"glue": ["boto3", "mypy-boto3-glue"], "md": ["duckdb>=0.7.0,<=0.9.2"]},
extras_require={"glue": ["boto3", "mypy-boto3-glue"], "md": ["duckdb>=0.10.2"]},
classifiers=[
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: Apache Software License",
Expand Down

0 comments on commit 08d5530

Please sign in to comment.