From dfeec677995ca7ad9fc8e67ffdbf1c28924341d5 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Thu, 27 Jul 2023 14:53:30 -0500 Subject: [PATCH 1/5] loosen the click pin --- core/setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/setup.py b/core/setup.py index c43cc6997fd..80891a80e5d 100644 --- a/core/setup.py +++ b/core/setup.py @@ -59,8 +59,7 @@ # ---- # dbt-core uses these packages in standard ways. Pin to the major version, and check compatibility # with major versions in each new minor version of dbt-core. - # temporarily pinning click for mypy failures: https://github.com/pallets/click/issues/2558 - "click>=8.1.1,<8.1.4", + "click<9", "networkx>=2.3,<4", # ---- # These packages are major-version-0. Keep upper bounds on upcoming minor versions (which could have breaking changes) @@ -69,8 +68,7 @@ "pathspec>=0.9,<0.12", "isodate>=0.6,<0.7", # ---- - # There was a pin to below 0.4.4 for a while due to a bug in Ubuntu/sqlparse 0.4.4 - "sqlparse>=0.2.3", + "sqlparse>=0.2.3, <0.5", # ---- # These are major-version-0 packages also maintained by dbt-labs. Accept patches. "dbt-extractor~=0.5.0", From fa2e1938987ffa6616a7950d6ab9bf8816cdcd9c Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Thu, 27 Jul 2023 14:57:33 -0500 Subject: [PATCH 2/5] changelog --- .changes/unreleased/Dependencies-20230727-145703.yaml | 6 ++++++ .changes/unreleased/Dependencies-20230727-145726.yaml | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 .changes/unreleased/Dependencies-20230727-145703.yaml create mode 100644 .changes/unreleased/Dependencies-20230727-145726.yaml diff --git a/.changes/unreleased/Dependencies-20230727-145703.yaml b/.changes/unreleased/Dependencies-20230727-145703.yaml new file mode 100644 index 00000000000..6cc64bf5102 --- /dev/null +++ b/.changes/unreleased/Dependencies-20230727-145703.yaml @@ -0,0 +1,6 @@ +kind: Dependencies +body: Update pin for click<9 +time: 2023-07-27T14:57:03.180458-05:00 +custom: + Author: emmyoop + PR: "8232" diff --git a/.changes/unreleased/Dependencies-20230727-145726.yaml b/.changes/unreleased/Dependencies-20230727-145726.yaml new file mode 100644 index 00000000000..cb85f9b99e0 --- /dev/null +++ b/.changes/unreleased/Dependencies-20230727-145726.yaml @@ -0,0 +1,6 @@ +kind: Dependencies +body: Add upper bound to sqlparse pin of <0.5 +time: 2023-07-27T14:57:26.40416-05:00 +custom: + Author: emmyoop + PR: "8232" From 7500f749035af540748bb0e28adbc03a69d833a5 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Thu, 27 Jul 2023 15:41:48 -0500 Subject: [PATCH 3/5] separate out sqlparse pin --- core/setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/setup.py b/core/setup.py index 80891a80e5d..c5248bbc150 100644 --- a/core/setup.py +++ b/core/setup.py @@ -68,7 +68,8 @@ "pathspec>=0.9,<0.12", "isodate>=0.6,<0.7", # ---- - "sqlparse>=0.2.3, <0.5", + # There was a pin to below 0.4.4 for a while due to a bug in Ubuntu/sqlparse 0.4.4 + "sqlparse>=0.2.3", # ---- # These are major-version-0 packages also maintained by dbt-labs. Accept patches. "dbt-extractor~=0.5.0", From 75701de2883cb903c091a6ff3be345f76ed1e0a9 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Thu, 27 Jul 2023 15:44:56 -0500 Subject: [PATCH 4/5] remove changelog --- .changes/unreleased/Dependencies-20230727-145726.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .changes/unreleased/Dependencies-20230727-145726.yaml diff --git a/.changes/unreleased/Dependencies-20230727-145726.yaml b/.changes/unreleased/Dependencies-20230727-145726.yaml deleted file mode 100644 index cb85f9b99e0..00000000000 --- a/.changes/unreleased/Dependencies-20230727-145726.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Dependencies -body: Add upper bound to sqlparse pin of <0.5 -time: 2023-07-27T14:57:26.40416-05:00 -custom: - Author: emmyoop - PR: "8232" From 41fedb61546b7f6f97b6435cf014284ec7accdbe Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Thu, 27 Jul 2023 16:07:56 -0500 Subject: [PATCH 5/5] add ignores --- core/dbt/cli/params.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/dbt/cli/params.py b/core/dbt/cli/params.py index 3bec7804f4e..e75f5f6419b 100644 --- a/core/dbt/cli/params.py +++ b/core/dbt/cli/params.py @@ -389,9 +389,9 @@ # Most CLI arguments should use the combined `select` option that aliases `--models` to `--select`. # However, if you need to split out these separators (like `dbt ls`), use the `models` and `raw_select` options instead. # See https://github.com/dbt-labs/dbt-core/pull/6774#issuecomment-1408476095 for more info. -models = click.option(*model_decls, **select_attrs) -raw_select = click.option(*select_decls, **select_attrs) -select = click.option(*select_decls, *model_decls, **select_attrs) +models = click.option(*model_decls, **select_attrs) # type: ignore[arg-type] +raw_select = click.option(*select_decls, **select_attrs) # type: ignore[arg-type] +select = click.option(*select_decls, *model_decls, **select_attrs) # type: ignore[arg-type] selector = click.option( "--selector",