From 84155fdff7c1c4949a2996732099b627659af678 Mon Sep 17 00:00:00 2001 From: Bastien Boutonnet Date: Mon, 8 Mar 2021 20:42:16 +0100 Subject: [PATCH 1/5] point hologram install to my fork and up dataclasses --- core/setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/setup.py b/core/setup.py index 5eb29bdc0b5..3306d433d63 100644 --- a/core/setup.py +++ b/core/setup.py @@ -69,8 +69,9 @@ def read(fname): 'isodate>=0.6,<0.7', 'json-rpc>=1.12,<2', 'werkzeug>=0.15,<2.0', - 'dataclasses==0.6;python_version<"3.7"', - 'hologram==0.0.13', + 'dataclasses==0.7;python_version<"3.7"', + # 'hologram==0.0.13', + 'hologram @ git+ssh://git@github.com/bastienboutonnet/hologram@chore/bump_dataclasses', 'logbook>=1.5,<1.6', 'mashumaro==2.0', 'typing-extensions>=3.7.4,<3.8', From 034a44e62592747b27f1ae29c6a7efcb79308af1 Mon Sep 17 00:00:00 2001 From: Bastien Boutonnet Date: Mon, 8 Mar 2021 21:02:00 +0100 Subject: [PATCH 2/5] fix git install link --- core/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/setup.py b/core/setup.py index 3306d433d63..a6c77f3c6aa 100644 --- a/core/setup.py +++ b/core/setup.py @@ -71,7 +71,7 @@ def read(fname): 'werkzeug>=0.15,<2.0', 'dataclasses==0.7;python_version<"3.7"', # 'hologram==0.0.13', - 'hologram @ git+ssh://git@github.com/bastienboutonnet/hologram@chore/bump_dataclasses', + 'hologram @ git+https://github.com/bastienboutonnet/hologram.git@chore/bump_dataclasses', 'logbook>=1.5,<1.6', 'mashumaro==2.0', 'typing-extensions>=3.7.4,<3.8', From 280f5614ef276f66c54ea677034c59ebe16f247a Mon Sep 17 00:00:00 2001 From: Bastien Boutonnet Date: Mon, 8 Mar 2021 22:24:46 +0100 Subject: [PATCH 3/5] bump hologram to 0.0.14 --- core/setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/setup.py b/core/setup.py index a6c77f3c6aa..a80c2a4cf84 100644 --- a/core/setup.py +++ b/core/setup.py @@ -70,8 +70,7 @@ def read(fname): 'json-rpc>=1.12,<2', 'werkzeug>=0.15,<2.0', 'dataclasses==0.7;python_version<"3.7"', - # 'hologram==0.0.13', - 'hologram @ git+https://github.com/bastienboutonnet/hologram.git@chore/bump_dataclasses', + 'hologram==0.0.14', 'logbook>=1.5,<1.6', 'mashumaro==2.0', 'typing-extensions>=3.7.4,<3.8', From af778312cb83c87ae6736d7665bda059dabc5b56 Mon Sep 17 00:00:00 2001 From: Bastien Boutonnet Date: Tue, 9 Mar 2021 15:55:22 +0100 Subject: [PATCH 4/5] relax dependency on dataclasses requirements as in hologram --- core/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/setup.py b/core/setup.py index a80c2a4cf84..470401e60fc 100644 --- a/core/setup.py +++ b/core/setup.py @@ -69,7 +69,7 @@ def read(fname): 'isodate>=0.6,<0.7', 'json-rpc>=1.12,<2', 'werkzeug>=0.15,<2.0', - 'dataclasses==0.7;python_version<"3.7"', + 'dataclasses>=0.6,<0.9;python_version<"3.7"', 'hologram==0.0.14', 'logbook>=1.5,<1.6', 'mashumaro==2.0', From 34174abf26cf258184eaf89e9a45242eb99e4afe Mon Sep 17 00:00:00 2001 From: Bastien Boutonnet Date: Tue, 9 Mar 2021 15:56:39 +0100 Subject: [PATCH 5/5] add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c25e0af1354..73981952468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fix incorrect error message when a selector does not match any node [#3036](https://github.com/fishtown-analytics/dbt/issues/3036)) - Fix variable `_dbt_max_partition` declaration and initialization for BigQuery incremental models ([#2940](https://github.com/fishtown-analytics/dbt/issues/2940), [#2976](https://github.com/fishtown-analytics/dbt/pull/2976)) - Moving from 'master' to 'HEAD' default branch in git ([#3057](https://github.com/fishtown-analytics/dbt/issues/3057), [#3104](https://github.com/fishtown-analytics/dbt/issues/3104), [#3117](https://github.com/fishtown-analytics/dbt/issues/3117))) +- Requirement on `dataclasses` is relaxed to be between `>=0.6,<0.9` allowing dbt to cohabit with other libraries which required higher versions. ([#3150](https://github.com/fishtown-analytics/dbt/issues/3150), [#3151](https://github.com/fishtown-analytics/dbt/pull/3151)) ### Features - Add optional configs for `require_partition_filter` and `partition_expiration_days` in BigQuery ([#1843](https://github.com/fishtown-analytics/dbt/issues/1843), [#2928](https://github.com/fishtown-analytics/dbt/pull/2928)) @@ -23,6 +24,7 @@ Contributors: - [ran-eh](https://github.com/ran-eh) ([#3036](https://github.com/fishtown-analytics/dbt/pull/3036)) - [@pcasteran](https://github.com/pcasteran) ([#2976](https://github.com/fishtown-analytics/dbt/pull/2976)) - [@VasiliiSurov](https://github.com/VasiliiSurov) ([#3104](https://github.com/fishtown-analytics/dbt/pull/3104)) +- [@bastienboutonnet](https://github.com/bastienboutonnet) ([#3151](https://github.com/fishtown-analytics/dbt/pull/3151)) ## dbt 0.19.1 (Release TBD)