diff --git a/.bumpversion-dbt.cfg b/.bumpversion-dbt.cfg index c211416d..34716819 100644 --- a/.bumpversion-dbt.cfg +++ b/.bumpversion-dbt.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.0 +current_version = 1.0.1 parse = (?P\d+) \.(?P\d+) \.(?P\d+) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d82f588c..cfded045 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.0 +current_version = 1.0.1 parse = (?P\d+) \.(?P\d+) \.(?P\d+) diff --git a/Makefile b/Makefile index bae4f48e..7fe5f03e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ dbt-trino-tests: ./docker/dbt/build.sh ./docker/init_trino.bash pip install -r dev_requirements.txt - tox || ./docker/remove_trino.bash + tox -r || ./docker/remove_trino.bash ./docker/remove_trino.bash dbt-starburst-tests: @@ -11,5 +11,5 @@ dbt-starburst-tests: ./docker/dbt/build.sh ./docker/init_starburst.bash pip install -r dev_requirements.txt - tox || ./docker/remove_starburst.bash + tox -r || ./docker/remove_starburst.bash ./docker/remove_starburst.bash diff --git a/README.md b/README.md index 3c8334c8..b70df4ac 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This repository represents a fork of the [dbt-presto](https://github.com/dbt-lab ### Compatibility -This dbt plugin has been tested against `Trino` version `366` and `Starburst Enterprise` version `365-e`. +This dbt plugin has been tested against `Trino` version `368` and `Starburst Enterprise` version `368-e`. ## Installation @@ -265,7 +265,7 @@ pip install -r dev_requirements.txt Run from the base directory of the project the command: ```sh -tox +tox -r ``` or @@ -284,8 +284,6 @@ bumpversion --config-file .bumpversion-dbt.cfg patch --new-version bumpversion --config-file .bumpversion.cfg patch --new-version --allow-dirty ``` -Additionally bump dbt-core version in dbt testing image `docker/dbt/Dockerfile`. - Next step is to merge bump commit and making sure that test suite pass. Finally to release `dbt-trino` to PyPi and GitHub trigger release workflow `release.yml`. diff --git a/dbt/adapters/trino/__version__.py b/dbt/adapters/trino/__version__.py index 11a716ec..86774adc 100644 --- a/dbt/adapters/trino/__version__.py +++ b/dbt/adapters/trino/__version__.py @@ -1 +1 @@ -version = "1.0.0" +version = "1.0.1" diff --git a/docker-compose-starburst.yml b/docker-compose-starburst.yml index 36047899..4fb233d4 100755 --- a/docker-compose-starburst.yml +++ b/docker-compose-starburst.yml @@ -3,7 +3,7 @@ services: trino: ports: - "8080:8080" - image: "starburstdata/starburst-enterprise:365-e" + image: "starburstdata/starburst-enterprise:368-e" volumes: - ./docker/starburst/etc:/etc/starburst - ./docker/starburst/catalog:/etc/starburst/catalog diff --git a/docker-compose-trino.yml b/docker-compose-trino.yml index 5cf70882..a71efb52 100644 --- a/docker-compose-trino.yml +++ b/docker-compose-trino.yml @@ -3,7 +3,7 @@ services: trino: ports: - "8080:8080" - image: "trinodb/trino:366" + image: "trinodb/trino:368" volumes: - ./docker/trino/etc:/usr/lib/trino/etc:ro - ./docker/trino/catalog:/etc/trino/catalog diff --git a/docker/dbt/Dockerfile b/docker/dbt/Dockerfile index 3f15e013..f58706fb 100644 --- a/docker/dbt/Dockerfile +++ b/docker/dbt/Dockerfile @@ -1,4 +1,4 @@ -FROM fishtownanalytics/dbt:1.0.0 +FROM python:3.9.9-slim-bullseye USER root ENV DBT_DIR /opt/dbt-trino diff --git a/requirements.txt b/requirements.txt index 261bacfa..f269ad04 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -dbt-core==1.0.0 +dbt-core==1.0.1 trino==0.309.0 diff --git a/setup.py b/setup.py index acc48ffc..ed01b4f7 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def _dbt_trino_version(): package_version = _dbt_trino_version() description = """The trino adapter plugin for dbt (data build tool)""" -dbt_version = "1.0.0" +dbt_version = "1.0.1" # the package version should be the dbt version, with maybe some things on the # ends of it. (0.19.1 vs 0.19.1a1, 0.19.1.1, ...) if not package_version.startswith(dbt_version): diff --git a/test/unit/test_adapter.py b/test/unit/test_adapter.py index b66fb10b..b268eac0 100644 --- a/test/unit/test_adapter.py +++ b/test/unit/test_adapter.py @@ -95,7 +95,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}")