From 5f24001749496d627ec3503939b68a71ebdd01f3 Mon Sep 17 00:00:00 2001 From: Muhammad Jarir Kanji <52061313+mjkanji@users.noreply.github.com> Date: Mon, 15 Apr 2024 21:23:44 +0500 Subject: [PATCH 1/6] Change agate upper bound to v1.10 --- core/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/setup.py b/core/setup.py index 88c380c8ef6..5baa2eb062e 100644 --- a/core/setup.py +++ b/core/setup.py @@ -49,7 +49,7 @@ # ---- # dbt-core uses these packages deeply, throughout the codebase, and there have been breaking changes in past patch releases (even though these are major-version-one). # Pin to the patch or minor version, and bump in each new minor version of dbt-core. - "agate>=1.7.0,<1.8", + "agate>=1.7.0,<1.10", "Jinja2>=3.1.3,<4", "mashumaro[msgpack]>=3.9,<4.0", # ---- From 99fefea1c3e4f2c1422d1406890da2e90b6aa19c Mon Sep 17 00:00:00 2001 From: Muhammad Jarir Kanji Date: Mon, 15 Apr 2024 21:39:19 +0500 Subject: [PATCH 2/6] Add changelog. --- .changes/unreleased/Dependencies-20240415-213850.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/unreleased/Dependencies-20240415-213850.yaml diff --git a/.changes/unreleased/Dependencies-20240415-213850.yaml b/.changes/unreleased/Dependencies-20240415-213850.yaml new file mode 100644 index 00000000000..958aae24260 --- /dev/null +++ b/.changes/unreleased/Dependencies-20240415-213850.yaml @@ -0,0 +1,6 @@ +kind: Dependencies +body: Update the agate upper bound to v1.10 +time: 2024-04-15T21:38:50.004793293+05:00 +custom: + Author: mjkanji + Issue: "9934" From e7139f326208dd9332b99fd6bb2f3304d0f31eab Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 1 May 2024 11:51:58 -0500 Subject: [PATCH 3/6] update lower pin --- .changes/unreleased/Dependencies-20240415-213850.yaml | 2 +- core/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.changes/unreleased/Dependencies-20240415-213850.yaml b/.changes/unreleased/Dependencies-20240415-213850.yaml index 958aae24260..de3130cc622 100644 --- a/.changes/unreleased/Dependencies-20240415-213850.yaml +++ b/.changes/unreleased/Dependencies-20240415-213850.yaml @@ -1,5 +1,5 @@ kind: Dependencies -body: Update the agate upper bound to v1.10 +body: Update the agate pin to "agate>=1.8.0,<1.10" time: 2024-04-15T21:38:50.004793293+05:00 custom: Author: mjkanji diff --git a/core/setup.py b/core/setup.py index 5baa2eb062e..be55e0ecf89 100644 --- a/core/setup.py +++ b/core/setup.py @@ -49,7 +49,7 @@ # ---- # dbt-core uses these packages deeply, throughout the codebase, and there have been breaking changes in past patch releases (even though these are major-version-one). # Pin to the patch or minor version, and bump in each new minor version of dbt-core. - "agate>=1.7.0,<1.10", + "agate>=1.8.0,<1.10", "Jinja2>=3.1.3,<4", "mashumaro[msgpack]>=3.9,<4.0", # ---- From 9aa50314812806d7865d3e44d56c8cee87566682 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 1 May 2024 12:52:21 -0500 Subject: [PATCH 4/6] for testing --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index c90f50ea531..bd313139d6b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ git+https://github.com/dbt-labs/dbt-adapters.git@main git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-tests-adapter -git+https://github.com/dbt-labs/dbt-common.git@main +git+https://github.com/dbt-labs/dbt-common.git@er/agate-pin git+https://github.com/dbt-labs/dbt-postgres.git@main black>=24.3.0,<25.0 bumpversion From 0fec7387701034f55848a8730d15431741b05b9e Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 1 May 2024 14:26:00 -0500 Subject: [PATCH 5/6] put back dev requirement --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index bd313139d6b..c90f50ea531 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ git+https://github.com/dbt-labs/dbt-adapters.git@main git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-tests-adapter -git+https://github.com/dbt-labs/dbt-common.git@er/agate-pin +git+https://github.com/dbt-labs/dbt-common.git@main git+https://github.com/dbt-labs/dbt-postgres.git@main black>=24.3.0,<25.0 bumpversion From 8aff9e4e63b79814197ef1076ea5337ff9d4d347 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 1 May 2024 15:56:28 -0500 Subject: [PATCH 6/6] move the lower pin back to 1.7 --- .changes/unreleased/Dependencies-20240415-213850.yaml | 2 +- core/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.changes/unreleased/Dependencies-20240415-213850.yaml b/.changes/unreleased/Dependencies-20240415-213850.yaml index de3130cc622..4b6519e252d 100644 --- a/.changes/unreleased/Dependencies-20240415-213850.yaml +++ b/.changes/unreleased/Dependencies-20240415-213850.yaml @@ -1,5 +1,5 @@ kind: Dependencies -body: Update the agate pin to "agate>=1.8.0,<1.10" +body: Update the agate pin to "agate>=1.7.0,<1.10" time: 2024-04-15T21:38:50.004793293+05:00 custom: Author: mjkanji diff --git a/core/setup.py b/core/setup.py index be55e0ecf89..5baa2eb062e 100644 --- a/core/setup.py +++ b/core/setup.py @@ -49,7 +49,7 @@ # ---- # dbt-core uses these packages deeply, throughout the codebase, and there have been breaking changes in past patch releases (even though these are major-version-one). # Pin to the patch or minor version, and bump in each new minor version of dbt-core. - "agate>=1.8.0,<1.10", + "agate>=1.7.0,<1.10", "Jinja2>=3.1.3,<4", "mashumaro[msgpack]>=3.9,<4.0", # ----