From da39f3c0db484c0d9b721de64a1b60292d3a88b0 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Fri, 2 Dec 2022 21:41:27 -0600 Subject: [PATCH 01/10] update changie to require issue or pr, and allow multiple --- .changie.yaml | 101 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 27 deletions(-) diff --git a/.changie.yaml b/.changie.yaml index 0744c5bb9c7..a20e85d001e 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -6,19 +6,67 @@ changelogPath: CHANGELOG.md versionExt: md versionFormat: '## dbt-core {{.Version}} - {{.Time.Format "January 02, 2006"}}' kindFormat: '### {{.Kind}}' -changeFormat: '- {{.Body}} ([#{{.Custom.Issue}}](https://github.com/dbt-labs/dbt-core/issues/{{.Custom.Issue}}), [#{{.Custom.PR}}](https://github.com/dbt-labs/dbt-core/pull/{{.Custom.PR}}))' +changeFormat: | + {{- $IssueList := list }} + {{- $changes := splitList " " $.Custom.Issue }} + {{- range $issueNbr := $changes }} + {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/issues/nbr)" | replace "nbr" $issueNbr }} + {{- $IssueList = append $IssueList $changeLink }} + {{- end }} + - {{.Body}} ({{ range $index, $element := $IssueList }}{{if $index}}, {{end}}{{$element}}{{end}}) kinds: - label: Breaking Changes - label: Features - label: Fixes - label: Docs - changeFormat: '- {{.Body}} ([dbt-docs/#{{.Custom.Issue}}](https://github.com/dbt-labs/dbt-docs/issues/{{.Custom.Issue}}), [dbt-docs/#{{.Custom.PR}}](https://github.com/dbt-labs/dbt-docs/pull/{{.Custom.PR}}))' + changeFormat: | + {{- $IssueList := list }} + {{- $changes := splitList " " $.Custom.Issue }} + {{- range $issueNbr := $changes }} + {{- $changeLink := "[dbt-docs/#nbr](https://github.com/dbt-labs/dbt-docs/issues/nbr)" | replace "nbr" $issueNbr }} + {{- $IssueList = append $IssueList $changeLink }} + {{- end }} + - {{.Body}} ({{ range $index, $element := $IssueList }}{{if $index}}, {{end}}{{$element}}{{end}}) - label: Under the Hood - label: Dependencies - changeFormat: '- {{.Body}} ({{if ne .Custom.Issue ""}}[#{{.Custom.Issue}}](https://github.com/dbt-labs/dbt-core/issues/{{.Custom.Issue}}), {{end}}[#{{.Custom.PR}}](https://github.com/dbt-labs/dbt-core/pull/{{.Custom.PR}}))' + changeFormat: | + {{- $PRList := list }} + {{- $changes := splitList " " $.Custom.PR }} + {{- range $pullrequest := $changes }} + {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/pull/nbr)" | replace "nbr" $pullrequest }} + {{- $PRList = append $PRList $changeLink }} + {{- end }} + - {{.Body}} ({{ range $index, $element := $PRList }}{{if $index}}, {{end}}{{$element}}{{end}}) + skipGlobalChoices: true + additionalChoices: + - key: Author + label: GitHub Username(s) (separated by a single space if multiple) + type: string + minLength: 3 + - key: PR + label: GitHub Pull Request Number (separated by a single space if multiple) + type: int + minInt: 1 - label: Security - changeFormat: '- {{.Body}} ({{if ne .Custom.Issue ""}}[#{{.Custom.Issue}}](https://github.com/dbt-labs/dbt-core/issues/{{.Custom.Issue}}), {{end}}[#{{.Custom.PR}}](https://github.com/dbt-labs/dbt-core/pull/{{.Custom.PR}}))' + changeFormat: | + {{- $PRList := list }} + {{- $changes := splitList " " $.Custom.PR }} + {{- range $pullrequest := $changes }} + {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/pull/nbr)" | replace "nbr" $pullrequest }} + {{- $PRList = append $PRList $changeLink }} + {{- end }} + - {{.Body}} ({{ range $index, $element := $PRList }}{{if $index}}, {{end}}{{$element}}{{end}}) + skipGlobalChoices: true + additionalChoices: + - key: Author + label: GitHub Username(s) (separated by a single space if multiple) + type: string + minLength: 3 + - key: PR + label: GitHub Pull Request Number (separated by a single space if multiple) + type: int + minInt: 1 newlines: afterChangelogHeader: 1 @@ -33,11 +81,7 @@ custom: type: string minLength: 3 - key: Issue - label: GitHub Issue Number - type: int - minInt: 1 -- key: PR - label: GitHub Pull Request Number + label: GitHub Issue Number (separated by a single space if multiple) type: int minInt: 1 @@ -47,28 +91,31 @@ footerFormat: | {{- $core_team := list "michelleark" "peterallenwebb" "emmyoop" "nathaniel-may" "gshank" "leahwicz" "chenyulinx" "stu-k" "iknox-fa" "versusfacit" "mcknight-42" "jtcohen6" "dependabot[bot]" "snyk-bot" "colin-rogers-dbt" }} {{- range $change := .Changes }} {{- $authorList := splitList " " $change.Custom.Author }} - {{- /* loop through all authors for a PR */}} + {{- /* loop through all authors for a single changelog */}} {{- range $author := $authorList }} {{- $authorLower := lower $author }} {{- /* we only want to include non-core team contributors */}} {{- if not (has $authorLower $core_team)}} - {{- /* Docs kind link back to dbt-docs instead of dbt-core PRs */}} - {{- $prLink := $change.Kind }} - {{- if eq $change.Kind "Docs" }} - {{- $prLink = "[dbt-docs/#pr](https://github.com/dbt-labs/dbt-docs/pull/pr)" | replace "pr" $change.Custom.PR }} - {{- else }} - {{- $prLink = "[#pr](https://github.com/dbt-labs/dbt-core/pull/pr)" | replace "pr" $change.Custom.PR }} - {{- end }} - {{- /* check if this contributor has other PRs associated with them already */}} - {{- if hasKey $contributorDict $author }} - {{- $prList := get $contributorDict $author }} - {{- $prList = append $prList $prLink }} - {{- $contributorDict := set $contributorDict $author $prList }} - {{- else }} - {{- $prList := list $prLink }} - {{- $contributorDict := set $contributorDict $author $prList }} - {{- end }} - {{- end}} + {{- $changeList := splitList " " $change.Custom.Author }} + {{- /* Docs kind link back to dbt-docs instead of dbt-core issues */}} + {{- $changeLink := $change.Kind }} + {{- if or (eq $change.Kind "Dependencies") (eq $change.Kind "Security") }} + {{- $changeLink = "[#nbr](https://github.com/dbt-labs/dbt-core/pull/nbr)" | replace "nbr" $change.Custom.PR }} + {{- else if eq $change.Kind "Docs"}} + {{- $changeLink = "[dbt-docs/#nbr](https://github.com/dbt-labs/dbt-docs/issues/nbr)" | replace "nbr" $change.Custom.Issue }} + {{- else }} + {{- $changeLink = "[#nbr](https://github.com/dbt-labs/dbt-core/issues/nbr)" | replace "nbr" $change.Custom.Issue }} + {{- end }} + {{- /* check if this contributor has other changes associated with them already */}} + {{- if hasKey $contributorDict $author }} + {{- $contributionList := get $contributorDict $author }} + {{- $contributionList = append $contributionList $changeLink }} + {{- $contributorDict := set $contributorDict $author $contributionList }} + {{- else }} + {{- $contributionList := list $changeLink }} + {{- $contributorDict := set $contributorDict $author $contributionList }} + {{- end }} + {{- end}} {{- end}} {{- end }} {{- /* no indentation here for formatting so the final markdown doesn't have unneeded indentations */}} From 7cf2d7882e6104a158a20bfb83c4577106f09bb1 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Fri, 2 Dec 2022 21:46:08 -0600 Subject: [PATCH 02/10] remove extraneous data from changelog files. --- .changes/unreleased/Dependency-20220923-000646.yaml | 1 - .changes/unreleased/Dependency-20221007-000848.yaml | 1 - .changes/unreleased/Dependency-20221020-000753.yaml | 1 - .changes/unreleased/Dependency-20221026-000910.yaml | 1 - .changes/unreleased/Docs-20220908-154157.yaml | 1 - .changes/unreleased/Docs-20221007-090656.yaml | 1 - .changes/unreleased/Docs-20221017-171411.yaml | 1 - .changes/unreleased/Docs-20221116-155743.yaml | 1 - .changes/unreleased/Docs-20221202-150523.yaml | 1 - .changes/unreleased/Features-20220408-165459.yaml | 1 - .changes/unreleased/Features-20220817-154857.yaml | 1 - .changes/unreleased/Features-20220912-125935.yaml | 1 - .changes/unreleased/Features-20220914-095625.yaml | 1 - .changes/unreleased/Features-20220925-211651.yaml | 1 - .changes/unreleased/Features-20221003-110705.yaml | 1 - .changes/unreleased/Features-20221102-150003.yaml | 1 - .changes/unreleased/Features-20221114-185207.yaml | 1 - .changes/unreleased/Features-20221130-112913.yaml | 1 - .changes/unreleased/Fixes-20220916-104854.yaml | 1 - .changes/unreleased/Fixes-20221010-113218.yaml | 1 - .changes/unreleased/Fixes-20221011-160715.yaml | 1 - .changes/unreleased/Fixes-20221016-173742.yaml | 1 - .changes/unreleased/Fixes-20221107-095314.yaml | 1 - .changes/unreleased/Fixes-20221115-081021.yaml | 1 - .changes/unreleased/Fixes-20221202-164859.yaml | 1 - .changes/unreleased/Under the Hood-20220927-194259.yaml | 1 - .changes/unreleased/Under the Hood-20220929-134406.yaml | 1 - .changes/unreleased/Under the Hood-20221005-120310.yaml | 1 - .changes/unreleased/Under the Hood-20221007-094627.yaml | 1 - .changes/unreleased/Under the Hood-20221007-140044.yaml | 1 - .changes/unreleased/Under the Hood-20221013-181912.yaml | 1 - .changes/unreleased/Under the Hood-20221017-151511.yaml | 1 - .changes/unreleased/Under the Hood-20221017-155844.yaml | 1 - .changes/unreleased/Under the Hood-20221028-104837.yaml | 1 - .changes/unreleased/Under the Hood-20221028-110344.yaml | 1 - .changes/unreleased/Under the Hood-20221108-074550.yaml | 1 - .changes/unreleased/Under the Hood-20221108-115633.yaml | 1 - .changes/unreleased/Under the Hood-20221108-133104.yaml | 1 - .changes/unreleased/Under the Hood-20221116-130037.yaml | 1 - 39 files changed, 39 deletions(-) diff --git a/.changes/unreleased/Dependency-20220923-000646.yaml b/.changes/unreleased/Dependency-20220923-000646.yaml index a8d3c0a64ad..3938b0f7a9b 100644 --- a/.changes/unreleased/Dependency-20220923-000646.yaml +++ b/.changes/unreleased/Dependency-20220923-000646.yaml @@ -3,5 +3,4 @@ body: "Update pathspec requirement from ~=0.9.0 to >=0.9,<0.11 in /core" time: 2022-09-23T00:06:46.00000Z custom: Author: dependabot[bot] - Issue: 4904 PR: 5917 diff --git a/.changes/unreleased/Dependency-20221007-000848.yaml b/.changes/unreleased/Dependency-20221007-000848.yaml index 8b2aebdc466..f7e999df885 100644 --- a/.changes/unreleased/Dependency-20221007-000848.yaml +++ b/.changes/unreleased/Dependency-20221007-000848.yaml @@ -3,5 +3,4 @@ body: "Bump black from 22.8.0 to 22.10.0" time: 2022-10-07T00:08:48.00000Z custom: Author: dependabot[bot] - Issue: 4904 PR: 6019 diff --git a/.changes/unreleased/Dependency-20221020-000753.yaml b/.changes/unreleased/Dependency-20221020-000753.yaml index ff6e7efc48f..14a73accb97 100644 --- a/.changes/unreleased/Dependency-20221020-000753.yaml +++ b/.changes/unreleased/Dependency-20221020-000753.yaml @@ -3,5 +3,4 @@ body: "Bump mashumaro[msgpack] from 3.0.4 to 3.1.1 in /core" time: 2022-10-20T00:07:53.00000Z custom: Author: dependabot[bot] - Issue: 4904 PR: 6108 diff --git a/.changes/unreleased/Dependency-20221026-000910.yaml b/.changes/unreleased/Dependency-20221026-000910.yaml index a5e5756e4cb..f96c7e0a1f3 100644 --- a/.changes/unreleased/Dependency-20221026-000910.yaml +++ b/.changes/unreleased/Dependency-20221026-000910.yaml @@ -3,5 +3,4 @@ body: "Update colorama requirement from <0.4.6,>=0.3.9 to >=0.3.9,<0.4.7 in /cor time: 2022-10-26T00:09:10.00000Z custom: Author: dependabot[bot] - Issue: 4904 PR: 6144 diff --git a/.changes/unreleased/Docs-20220908-154157.yaml b/.changes/unreleased/Docs-20220908-154157.yaml index 2b2d30d41e5..e307f3bd5e0 100644 --- a/.changes/unreleased/Docs-20220908-154157.yaml +++ b/.changes/unreleased/Docs-20220908-154157.yaml @@ -4,4 +4,3 @@ time: 2022-09-08T15:41:57.689162-04:00 custom: Author: andy-clapson Issue: "5791" - PR: "5684" diff --git a/.changes/unreleased/Docs-20221007-090656.yaml b/.changes/unreleased/Docs-20221007-090656.yaml index 1159879a249..070ecd48944 100644 --- a/.changes/unreleased/Docs-20221007-090656.yaml +++ b/.changes/unreleased/Docs-20221007-090656.yaml @@ -4,4 +4,3 @@ time: 2022-10-07T09:06:56.446078-05:00 custom: Author: stu-k Issue: "5528" - PR: "6022" diff --git a/.changes/unreleased/Docs-20221017-171411.yaml b/.changes/unreleased/Docs-20221017-171411.yaml index 6f480f3c4bd..487362c1d5c 100644 --- a/.changes/unreleased/Docs-20221017-171411.yaml +++ b/.changes/unreleased/Docs-20221017-171411.yaml @@ -3,4 +3,3 @@ time: 2022-10-17T17:14:11.715348-05:00 custom: Author: paulbenschmidt Issue: "5880" - PR: "324" diff --git a/.changes/unreleased/Docs-20221116-155743.yaml b/.changes/unreleased/Docs-20221116-155743.yaml index 0b5ce05ee69..84d90a67b99 100644 --- a/.changes/unreleased/Docs-20221116-155743.yaml +++ b/.changes/unreleased/Docs-20221116-155743.yaml @@ -4,4 +4,3 @@ time: 2022-11-16T15:57:43.204201+01:00 custom: Author: jtcohen6 Issue: "323" - PR: "346" diff --git a/.changes/unreleased/Docs-20221202-150523.yaml b/.changes/unreleased/Docs-20221202-150523.yaml index cf0b4edb2d8..b08a32cddf6 100644 --- a/.changes/unreleased/Docs-20221202-150523.yaml +++ b/.changes/unreleased/Docs-20221202-150523.yaml @@ -4,4 +4,3 @@ time: 2022-12-02T15:05:23.695333-07:00 custom: Author: dbeatty10 Issue: "6368" - PR: "6371" diff --git a/.changes/unreleased/Features-20220408-165459.yaml b/.changes/unreleased/Features-20220408-165459.yaml index c29cfc617c7..12cdf74c757 100644 --- a/.changes/unreleased/Features-20220408-165459.yaml +++ b/.changes/unreleased/Features-20220408-165459.yaml @@ -5,4 +5,3 @@ time: 2022-04-08T16:54:59.696564+01:00 custom: Author: daniel-murray josephberni Issue: "2968" - PR: "5859" diff --git a/.changes/unreleased/Features-20220817-154857.yaml b/.changes/unreleased/Features-20220817-154857.yaml index f22e48b91a0..ad53df05a3f 100644 --- a/.changes/unreleased/Features-20220817-154857.yaml +++ b/.changes/unreleased/Features-20220817-154857.yaml @@ -4,4 +4,3 @@ time: 2022-08-17T15:48:57.225267-04:00 custom: Author: gshank Issue: "5610" - PR: "5643" diff --git a/.changes/unreleased/Features-20220912-125935.yaml b/.changes/unreleased/Features-20220912-125935.yaml index b0c1dd41a26..d49f35fd0af 100644 --- a/.changes/unreleased/Features-20220912-125935.yaml +++ b/.changes/unreleased/Features-20220912-125935.yaml @@ -4,4 +4,3 @@ time: 2022-09-12T12:59:35.121188+01:00 custom: Author: jared-rimmer Issue: "5486" - PR: "5812" diff --git a/.changes/unreleased/Features-20220914-095625.yaml b/.changes/unreleased/Features-20220914-095625.yaml index 51828084a0d..d46b1bfa8d8 100644 --- a/.changes/unreleased/Features-20220914-095625.yaml +++ b/.changes/unreleased/Features-20220914-095625.yaml @@ -4,4 +4,3 @@ time: 2022-09-14T09:56:25.97818-07:00 custom: Author: colin-rogers-dbt Issue: "5521" - PR: "5838" diff --git a/.changes/unreleased/Features-20220925-211651.yaml b/.changes/unreleased/Features-20220925-211651.yaml index 0f0f6e84213..d2c1911c720 100644 --- a/.changes/unreleased/Features-20220925-211651.yaml +++ b/.changes/unreleased/Features-20220925-211651.yaml @@ -4,4 +4,3 @@ time: 2022-09-25T21:16:51.051239654+02:00 custom: Author: pgoslatara Issue: "5929" - PR: "5930" diff --git a/.changes/unreleased/Features-20221003-110705.yaml b/.changes/unreleased/Features-20221003-110705.yaml index f8142666c3b..637d8be58c6 100644 --- a/.changes/unreleased/Features-20221003-110705.yaml +++ b/.changes/unreleased/Features-20221003-110705.yaml @@ -4,4 +4,3 @@ time: 2022-10-03T11:07:05.381632-05:00 custom: Author: dave-connors-3 Issue: "5990" - PR: "5991" diff --git a/.changes/unreleased/Features-20221102-150003.yaml b/.changes/unreleased/Features-20221102-150003.yaml index ca45893dfe9..9d8ba192687 100644 --- a/.changes/unreleased/Features-20221102-150003.yaml +++ b/.changes/unreleased/Features-20221102-150003.yaml @@ -5,4 +5,3 @@ time: 2022-11-02T15:00:03.000805-05:00 custom: Author: racheldaniel Issue: "6201" - PR: "6202" diff --git a/.changes/unreleased/Features-20221114-185207.yaml b/.changes/unreleased/Features-20221114-185207.yaml index 16ea3fb5918..459bc8ce234 100644 --- a/.changes/unreleased/Features-20221114-185207.yaml +++ b/.changes/unreleased/Features-20221114-185207.yaml @@ -4,4 +4,3 @@ time: 2022-11-14T18:52:07.788593+02:00 custom: Author: haritamar Issue: "6246" - PR: "6247" diff --git a/.changes/unreleased/Features-20221130-112913.yaml b/.changes/unreleased/Features-20221130-112913.yaml index b640ab3e690..64832de2f68 100644 --- a/.changes/unreleased/Features-20221130-112913.yaml +++ b/.changes/unreleased/Features-20221130-112913.yaml @@ -4,4 +4,3 @@ time: 2022-11-30T11:29:13.256034-05:00 custom: Author: michelleark Issue: "6057" - PR: "6342" diff --git a/.changes/unreleased/Fixes-20220916-104854.yaml b/.changes/unreleased/Fixes-20220916-104854.yaml index 64e76c43a3f..bd9af0469a7 100644 --- a/.changes/unreleased/Fixes-20220916-104854.yaml +++ b/.changes/unreleased/Fixes-20220916-104854.yaml @@ -4,4 +4,3 @@ time: 2022-09-16T10:48:54.162273-05:00 custom: Author: emmyoop Issue: "3992" - PR: "5868" diff --git a/.changes/unreleased/Fixes-20221010-113218.yaml b/.changes/unreleased/Fixes-20221010-113218.yaml index 73f128ec5b7..5b73b8d9ccd 100644 --- a/.changes/unreleased/Fixes-20221010-113218.yaml +++ b/.changes/unreleased/Fixes-20221010-113218.yaml @@ -4,4 +4,3 @@ time: 2022-10-10T11:32:18.752322-05:00 custom: Author: emmyoop Issue: "6030" - PR: "6038" diff --git a/.changes/unreleased/Fixes-20221011-160715.yaml b/.changes/unreleased/Fixes-20221011-160715.yaml index 273e1398bdd..936546a5232 100644 --- a/.changes/unreleased/Fixes-20221011-160715.yaml +++ b/.changes/unreleased/Fixes-20221011-160715.yaml @@ -4,4 +4,3 @@ time: 2022-10-11T16:07:15.464093-04:00 custom: Author: chamini2 Issue: "6041" - PR: "6042" diff --git a/.changes/unreleased/Fixes-20221016-173742.yaml b/.changes/unreleased/Fixes-20221016-173742.yaml index 11d4a8c85f4..c7b00dddba8 100644 --- a/.changes/unreleased/Fixes-20221016-173742.yaml +++ b/.changes/unreleased/Fixes-20221016-173742.yaml @@ -5,4 +5,3 @@ time: 2022-10-16T17:37:42.846683-07:00 custom: Author: versusfacit Issue: "5436" - PR: "5874" diff --git a/.changes/unreleased/Fixes-20221107-095314.yaml b/.changes/unreleased/Fixes-20221107-095314.yaml index f3763b7d039..99da9c44522 100644 --- a/.changes/unreleased/Fixes-20221107-095314.yaml +++ b/.changes/unreleased/Fixes-20221107-095314.yaml @@ -4,4 +4,3 @@ time: 2022-11-07T09:53:14.340257-06:00 custom: Author: ChenyuLInx Issue: "5625" - PR: "6059" diff --git a/.changes/unreleased/Fixes-20221115-081021.yaml b/.changes/unreleased/Fixes-20221115-081021.yaml index d995a2c4fa7..40c81fabacb 100644 --- a/.changes/unreleased/Fixes-20221115-081021.yaml +++ b/.changes/unreleased/Fixes-20221115-081021.yaml @@ -4,4 +4,3 @@ time: 2022-11-15T08:10:21.527884-05:00 custom: Author: justbldwn Issue: "6245" - PR: "6251" diff --git a/.changes/unreleased/Fixes-20221202-164859.yaml b/.changes/unreleased/Fixes-20221202-164859.yaml index 65d17625ac0..6aad4ced192 100644 --- a/.changes/unreleased/Fixes-20221202-164859.yaml +++ b/.changes/unreleased/Fixes-20221202-164859.yaml @@ -4,4 +4,3 @@ time: 2022-12-02T16:48:59.029519-05:00 custom: Author: gshank Issue: "6055" - PR: "6081" diff --git a/.changes/unreleased/Under the Hood-20220927-194259.yaml b/.changes/unreleased/Under the Hood-20220927-194259.yaml index dbd85165e2c..b6cb64b0155 100644 --- a/.changes/unreleased/Under the Hood-20220927-194259.yaml +++ b/.changes/unreleased/Under the Hood-20220927-194259.yaml @@ -4,4 +4,3 @@ time: 2022-09-27T19:42:59.241433-07:00 custom: Author: max-sixty Issue: "5946" - PR: "5947" diff --git a/.changes/unreleased/Under the Hood-20220929-134406.yaml b/.changes/unreleased/Under the Hood-20220929-134406.yaml index ce69bdf322a..b0175190747 100644 --- a/.changes/unreleased/Under the Hood-20220929-134406.yaml +++ b/.changes/unreleased/Under the Hood-20220929-134406.yaml @@ -4,4 +4,3 @@ time: 2022-09-29T13:44:06.275941-04:00 custom: Author: peterallenwebb Issue: "5809" - PR: "5975" diff --git a/.changes/unreleased/Under the Hood-20221005-120310.yaml b/.changes/unreleased/Under the Hood-20221005-120310.yaml index eb87a14fedc..797be31c319 100644 --- a/.changes/unreleased/Under the Hood-20221005-120310.yaml +++ b/.changes/unreleased/Under the Hood-20221005-120310.yaml @@ -4,4 +4,3 @@ time: 2022-10-05T12:03:10.061263-07:00 custom: Author: max-sixty Issue: "5983" - PR: "5983" diff --git a/.changes/unreleased/Under the Hood-20221007-094627.yaml b/.changes/unreleased/Under the Hood-20221007-094627.yaml index 950c20577ed..d3a5da61566 100644 --- a/.changes/unreleased/Under the Hood-20221007-094627.yaml +++ b/.changes/unreleased/Under the Hood-20221007-094627.yaml @@ -4,4 +4,3 @@ time: 2022-10-07T09:46:27.682872-05:00 custom: Author: emmyoop Issue: "6023" - PR: "6024" diff --git a/.changes/unreleased/Under the Hood-20221007-140044.yaml b/.changes/unreleased/Under the Hood-20221007-140044.yaml index b41e3f6eb5a..971d5a40ce8 100644 --- a/.changes/unreleased/Under the Hood-20221007-140044.yaml +++ b/.changes/unreleased/Under the Hood-20221007-140044.yaml @@ -4,4 +4,3 @@ time: 2022-10-07T14:00:44.227644-07:00 custom: Author: max-sixty Issue: "6028" - PR: "5978" diff --git a/.changes/unreleased/Under the Hood-20221013-181912.yaml b/.changes/unreleased/Under the Hood-20221013-181912.yaml index 2f03b9b29ff..4f5218891b4 100644 --- a/.changes/unreleased/Under the Hood-20221013-181912.yaml +++ b/.changes/unreleased/Under the Hood-20221013-181912.yaml @@ -4,4 +4,3 @@ time: 2022-10-13T18:19:12.167548-04:00 custom: Author: peterallenwebb Issue: "5229" - PR: "6025" diff --git a/.changes/unreleased/Under the Hood-20221017-151511.yaml b/.changes/unreleased/Under the Hood-20221017-151511.yaml index cbdcf04beb3..94f4d27d6de 100644 --- a/.changes/unreleased/Under the Hood-20221017-151511.yaml +++ b/.changes/unreleased/Under the Hood-20221017-151511.yaml @@ -4,4 +4,3 @@ time: 2022-10-17T15:15:11.499246-05:00 custom: Author: luke-bassett Issue: "1350" - PR: "6086" diff --git a/.changes/unreleased/Under the Hood-20221017-155844.yaml b/.changes/unreleased/Under the Hood-20221017-155844.yaml index 84e6675351c..c46ef040410 100644 --- a/.changes/unreleased/Under the Hood-20221017-155844.yaml +++ b/.changes/unreleased/Under the Hood-20221017-155844.yaml @@ -4,4 +4,3 @@ time: 2022-10-17T15:58:44.676549-04:00 custom: Author: eve-johns Issue: "6068" - PR: "6082" diff --git a/.changes/unreleased/Under the Hood-20221028-104837.yaml b/.changes/unreleased/Under the Hood-20221028-104837.yaml index 22ad4901794..446d4898920 100644 --- a/.changes/unreleased/Under the Hood-20221028-104837.yaml +++ b/.changes/unreleased/Under the Hood-20221028-104837.yaml @@ -4,4 +4,3 @@ time: 2022-10-28T10:48:37.687886-04:00 custom: Author: gshank Issue: "6171" - PR: "6172" diff --git a/.changes/unreleased/Under the Hood-20221028-110344.yaml b/.changes/unreleased/Under the Hood-20221028-110344.yaml index 4ee0a7dc214..cbe8dacb3d5 100644 --- a/.changes/unreleased/Under the Hood-20221028-110344.yaml +++ b/.changes/unreleased/Under the Hood-20221028-110344.yaml @@ -4,4 +4,3 @@ time: 2022-10-28T11:03:44.887836-04:00 custom: Author: gshank Issue: "6173" - PR: "6174" diff --git a/.changes/unreleased/Under the Hood-20221108-074550.yaml b/.changes/unreleased/Under the Hood-20221108-074550.yaml index 351887f767a..a8fbc7e208b 100644 --- a/.changes/unreleased/Under the Hood-20221108-074550.yaml +++ b/.changes/unreleased/Under the Hood-20221108-074550.yaml @@ -4,4 +4,3 @@ time: 2022-11-08T07:45:50.589147-06:00 custom: Author: stu-k Issue: "5942" - PR: "6226" diff --git a/.changes/unreleased/Under the Hood-20221108-115633.yaml b/.changes/unreleased/Under the Hood-20221108-115633.yaml index 2ba10536728..ea073719cda 100644 --- a/.changes/unreleased/Under the Hood-20221108-115633.yaml +++ b/.changes/unreleased/Under the Hood-20221108-115633.yaml @@ -4,4 +4,3 @@ time: 2022-11-08T11:56:33.743042-06:00 custom: Author: stu-k Issue: "5770" - PR: "6228" diff --git a/.changes/unreleased/Under the Hood-20221108-133104.yaml b/.changes/unreleased/Under the Hood-20221108-133104.yaml index 4aea5ee8cd9..6829dc097eb 100644 --- a/.changes/unreleased/Under the Hood-20221108-133104.yaml +++ b/.changes/unreleased/Under the Hood-20221108-133104.yaml @@ -4,4 +4,3 @@ time: 2022-11-08T13:31:04.788547-06:00 custom: Author: stu-k Issue: "5771" - PR: "6230" diff --git a/.changes/unreleased/Under the Hood-20221116-130037.yaml b/.changes/unreleased/Under the Hood-20221116-130037.yaml index b7ed5e750d6..ecdedd6bd2d 100644 --- a/.changes/unreleased/Under the Hood-20221116-130037.yaml +++ b/.changes/unreleased/Under the Hood-20221116-130037.yaml @@ -4,4 +4,3 @@ time: 2022-11-16T13:00:37.916202-06:00 custom: Author: stu-k Issue: "5942" - PR: "6187" From 855acc210ebabe9477de49560f31313a2981e0c5 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Fri, 2 Dec 2022 21:49:08 -0600 Subject: [PATCH 03/10] allow for multiple PR/issues to be entered --- .changie.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.changie.yaml b/.changie.yaml index a20e85d001e..3660dafc24e 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -46,8 +46,8 @@ kinds: minLength: 3 - key: PR label: GitHub Pull Request Number (separated by a single space if multiple) - type: int - minInt: 1 + type: string + minLength: 1 - label: Security changeFormat: | {{- $PRList := list }} @@ -65,8 +65,8 @@ kinds: minLength: 3 - key: PR label: GitHub Pull Request Number (separated by a single space if multiple) - type: int - minInt: 1 + type: string + minLength: 1 newlines: afterChangelogHeader: 1 @@ -82,8 +82,8 @@ custom: minLength: 3 - key: Issue label: GitHub Issue Number (separated by a single space if multiple) - type: int - minInt: 1 + type: string + minLength: 1 footerFormat: | {{- $contributorDict := dict }} From 930a5fb7ef75a3fefab1041bff55805ff8ddabfb Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Fri, 2 Dec 2022 21:58:50 -0600 Subject: [PATCH 04/10] update contributing guide --- CONTRIBUTING.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index efbb0a726ad..9763e3ed4b1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -201,13 +201,15 @@ Here are some general rules for adding tests: * Sometimes flake8 complains about lines that are actually fine, in which case you can put a comment on the line such as: # noqa or # noqa: ANNN, where ANNN is the error code that flake8 issues. * To collect output for `CProfile`, run dbt with the `-r` option and the name of an output file, i.e. `dbt -r dbt.cprof run`. If you just want to profile parsing, you can do: `dbt -r dbt.cprof parse`. `pip` install `snakeviz` to view the output. Run `snakeviz dbt.cprof` and output will be rendered in a browser window. -## Adding a CHANGELOG Entry +## Adding or modifying a CHANGELOG Entry We use [changie](https://changie.dev) to generate `CHANGELOG` entries. **Note:** Do not edit the `CHANGELOG.md` directly. Your modifications will be lost. Follow the steps to [install `changie`](https://changie.dev/guide/installation/) for your system. -Once changie is installed and your PR is created, simply run `changie new` and changie will walk you through the process of creating a changelog entry. Commit the file that's created and your changelog entry is complete! +Once changie is installed and your PR is created for a new feature, simply run `changie new` and changie will walk you through the process of creating a changelog entry. Commit the file that's created and your changelog entry is complete! + +If you are contributing to a feature already in progress, you will modify the changie yaml file in `dbt/.changes/unreleased` related to your change. If you need help finding this file, please ask! You don't need to worry about which `dbt-core` version your change will go into. Just create the changelog entry with `changie`, and open your PR against the `main` branch. All merged changes will be included in the next minor version of `dbt-core`. The Core maintainers _may_ choose to "backport" specific changes in order to patch older minor versions. In that case, a maintainer will take care of that backport after merging your PR, before releasing the new version of `dbt-core`. From 3b33b420802906f94d50b4c0a345c4e0936ccbf4 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Fri, 2 Dec 2022 22:01:23 -0600 Subject: [PATCH 05/10] remove issue number from bot changelogs --- .github/workflows/bot-changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bot-changelog.yml b/.github/workflows/bot-changelog.yml index 2d06fafe682..79ba34835fa 100644 --- a/.github/workflows/bot-changelog.yml +++ b/.github/workflows/bot-changelog.yml @@ -58,4 +58,4 @@ jobs: commit_message: "Add automated changelog yaml from template for bot PR" changie_kind: ${{ matrix.changie_kind }} label: ${{ matrix.label }} - custom_changelog_string: "custom:\n Author: ${{ github.event.pull_request.user.login }}\n Issue: 4904\n PR: ${{ github.event.pull_request.number }}" + custom_changelog_string: "custom:\n Author: ${{ github.event.pull_request.user.login }}\n PR: ${{ github.event.pull_request.number }}" From 7e020a36664f7535ab62b926505c432e7ac96af9 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Sun, 11 Dec 2022 06:54:53 -0600 Subject: [PATCH 06/10] update format of PR --- .changes/unreleased/Dependency-20220923-000646.yaml | 2 +- .changes/unreleased/Dependency-20221007-000848.yaml | 2 +- .changes/unreleased/Dependency-20221020-000753.yaml | 2 +- .changes/unreleased/Dependency-20221026-000910.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.changes/unreleased/Dependency-20220923-000646.yaml b/.changes/unreleased/Dependency-20220923-000646.yaml index 3938b0f7a9b..cab9c4d2f4c 100644 --- a/.changes/unreleased/Dependency-20220923-000646.yaml +++ b/.changes/unreleased/Dependency-20220923-000646.yaml @@ -3,4 +3,4 @@ body: "Update pathspec requirement from ~=0.9.0 to >=0.9,<0.11 in /core" time: 2022-09-23T00:06:46.00000Z custom: Author: dependabot[bot] - PR: 5917 + PR: "5917" diff --git a/.changes/unreleased/Dependency-20221007-000848.yaml b/.changes/unreleased/Dependency-20221007-000848.yaml index f7e999df885..4abdfb55f1f 100644 --- a/.changes/unreleased/Dependency-20221007-000848.yaml +++ b/.changes/unreleased/Dependency-20221007-000848.yaml @@ -3,4 +3,4 @@ body: "Bump black from 22.8.0 to 22.10.0" time: 2022-10-07T00:08:48.00000Z custom: Author: dependabot[bot] - PR: 6019 + PR: "6019" diff --git a/.changes/unreleased/Dependency-20221020-000753.yaml b/.changes/unreleased/Dependency-20221020-000753.yaml index 14a73accb97..5043b2b9d00 100644 --- a/.changes/unreleased/Dependency-20221020-000753.yaml +++ b/.changes/unreleased/Dependency-20221020-000753.yaml @@ -3,4 +3,4 @@ body: "Bump mashumaro[msgpack] from 3.0.4 to 3.1.1 in /core" time: 2022-10-20T00:07:53.00000Z custom: Author: dependabot[bot] - PR: 6108 + PR: "6108" diff --git a/.changes/unreleased/Dependency-20221026-000910.yaml b/.changes/unreleased/Dependency-20221026-000910.yaml index f96c7e0a1f3..fed0ee56979 100644 --- a/.changes/unreleased/Dependency-20221026-000910.yaml +++ b/.changes/unreleased/Dependency-20221026-000910.yaml @@ -3,4 +3,4 @@ body: "Update colorama requirement from <0.4.6,>=0.3.9 to >=0.3.9,<0.4.7 in /cor time: 2022-10-26T00:09:10.00000Z custom: Author: dependabot[bot] - PR: 6144 + PR: "6144" From 59d3cd4ae1c47babca2ade882773e1d0730b35c3 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Sun, 11 Dec 2022 06:57:25 -0600 Subject: [PATCH 07/10] fix dependency changelogs --- .changes/unreleased/Dependency-20220923-000646.yaml | 2 +- .changes/unreleased/Dependency-20221007-000848.yaml | 2 +- .changes/unreleased/Dependency-20221020-000753.yaml | 2 +- .changes/unreleased/Dependency-20221026-000910.yaml | 2 +- .github/workflows/bot-changelog.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.changes/unreleased/Dependency-20220923-000646.yaml b/.changes/unreleased/Dependency-20220923-000646.yaml index cab9c4d2f4c..0375eeb125f 100644 --- a/.changes/unreleased/Dependency-20220923-000646.yaml +++ b/.changes/unreleased/Dependency-20220923-000646.yaml @@ -1,4 +1,4 @@ -kind: "Dependency" +kind: "Dependencies" body: "Update pathspec requirement from ~=0.9.0 to >=0.9,<0.11 in /core" time: 2022-09-23T00:06:46.00000Z custom: diff --git a/.changes/unreleased/Dependency-20221007-000848.yaml b/.changes/unreleased/Dependency-20221007-000848.yaml index 4abdfb55f1f..7e36733d14e 100644 --- a/.changes/unreleased/Dependency-20221007-000848.yaml +++ b/.changes/unreleased/Dependency-20221007-000848.yaml @@ -1,4 +1,4 @@ -kind: "Dependency" +kind: "Dependencies" body: "Bump black from 22.8.0 to 22.10.0" time: 2022-10-07T00:08:48.00000Z custom: diff --git a/.changes/unreleased/Dependency-20221020-000753.yaml b/.changes/unreleased/Dependency-20221020-000753.yaml index 5043b2b9d00..ce0f122826b 100644 --- a/.changes/unreleased/Dependency-20221020-000753.yaml +++ b/.changes/unreleased/Dependency-20221020-000753.yaml @@ -1,4 +1,4 @@ -kind: "Dependency" +kind: "Dependencies" body: "Bump mashumaro[msgpack] from 3.0.4 to 3.1.1 in /core" time: 2022-10-20T00:07:53.00000Z custom: diff --git a/.changes/unreleased/Dependency-20221026-000910.yaml b/.changes/unreleased/Dependency-20221026-000910.yaml index fed0ee56979..d68fa8a11ef 100644 --- a/.changes/unreleased/Dependency-20221026-000910.yaml +++ b/.changes/unreleased/Dependency-20221026-000910.yaml @@ -1,4 +1,4 @@ -kind: "Dependency" +kind: "Dependencies" body: "Update colorama requirement from <0.4.6,>=0.3.9 to >=0.3.9,<0.4.7 in /core" time: 2022-10-26T00:09:10.00000Z custom: diff --git a/.github/workflows/bot-changelog.yml b/.github/workflows/bot-changelog.yml index 79ba34835fa..c6d2a1507a3 100644 --- a/.github/workflows/bot-changelog.yml +++ b/.github/workflows/bot-changelog.yml @@ -40,7 +40,7 @@ jobs: matrix: include: - label: "dependencies" - changie_kind: "Dependency" + changie_kind: "Dependencies" - label: "snyk" changie_kind: "Security" runs-on: ubuntu-latest From 95d7a9b7877a63dafc1d9a369aa8606fc7b97d63 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Sun, 11 Dec 2022 07:06:10 -0600 Subject: [PATCH 08/10] remove extra line --- .changie.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.changie.yaml b/.changie.yaml index 3660dafc24e..46454148e76 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -12,7 +12,7 @@ changeFormat: | {{- range $issueNbr := $changes }} {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/issues/nbr)" | replace "nbr" $issueNbr }} {{- $IssueList = append $IssueList $changeLink }} - {{- end }} + {{- end -}} - {{.Body}} ({{ range $index, $element := $IssueList }}{{if $index}}, {{end}}{{$element}}{{end}}) kinds: @@ -26,7 +26,7 @@ kinds: {{- range $issueNbr := $changes }} {{- $changeLink := "[dbt-docs/#nbr](https://github.com/dbt-labs/dbt-docs/issues/nbr)" | replace "nbr" $issueNbr }} {{- $IssueList = append $IssueList $changeLink }} - {{- end }} + {{- end -}} - {{.Body}} ({{ range $index, $element := $IssueList }}{{if $index}}, {{end}}{{$element}}{{end}}) - label: Under the Hood - label: Dependencies @@ -36,7 +36,7 @@ kinds: {{- range $pullrequest := $changes }} {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/pull/nbr)" | replace "nbr" $pullrequest }} {{- $PRList = append $PRList $changeLink }} - {{- end }} + {{- end -}} - {{.Body}} ({{ range $index, $element := $PRList }}{{if $index}}, {{end}}{{$element}}{{end}}) skipGlobalChoices: true additionalChoices: @@ -55,7 +55,7 @@ kinds: {{- range $pullrequest := $changes }} {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/pull/nbr)" | replace "nbr" $pullrequest }} {{- $PRList = append $PRList $changeLink }} - {{- end }} + {{- end -}} - {{.Body}} ({{ range $index, $element := $PRList }}{{if $index}}, {{end}}{{$element}}{{end}}) skipGlobalChoices: true additionalChoices: From 17a0b41fb8a48ce9930fcf440e5bdd257d9084aa Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Sun, 11 Dec 2022 07:18:43 -0600 Subject: [PATCH 09/10] remove extra lines, tweak contributor wording --- .changie.yaml | 8 ++++---- CONTRIBUTING.md | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.changie.yaml b/.changie.yaml index 46454148e76..0571d809681 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -6,7 +6,7 @@ changelogPath: CHANGELOG.md versionExt: md versionFormat: '## dbt-core {{.Version}} - {{.Time.Format "January 02, 2006"}}' kindFormat: '### {{.Kind}}' -changeFormat: | +changeFormat: |- {{- $IssueList := list }} {{- $changes := splitList " " $.Custom.Issue }} {{- range $issueNbr := $changes }} @@ -20,7 +20,7 @@ kinds: - label: Features - label: Fixes - label: Docs - changeFormat: | + changeFormat: |- {{- $IssueList := list }} {{- $changes := splitList " " $.Custom.Issue }} {{- range $issueNbr := $changes }} @@ -30,7 +30,7 @@ kinds: - {{.Body}} ({{ range $index, $element := $IssueList }}{{if $index}}, {{end}}{{$element}}{{end}}) - label: Under the Hood - label: Dependencies - changeFormat: | + changeFormat: |- {{- $PRList := list }} {{- $changes := splitList " " $.Custom.PR }} {{- range $pullrequest := $changes }} @@ -49,7 +49,7 @@ kinds: type: string minLength: 1 - label: Security - changeFormat: | + changeFormat: |- {{- $PRList := list }} {{- $changes := splitList " " $.Custom.PR }} {{- range $pullrequest := $changes }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9763e3ed4b1..27eacfbb14e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -207,9 +207,15 @@ We use [changie](https://changie.dev) to generate `CHANGELOG` entries. **Note:** Follow the steps to [install `changie`](https://changie.dev/guide/installation/) for your system. -Once changie is installed and your PR is created for a new feature, simply run `changie new` and changie will walk you through the process of creating a changelog entry. Commit the file that's created and your changelog entry is complete! +Once changie is installed and your PR is created for a new feature, simply run the following command and changie will walk you through the process of creating a changelog entry: -If you are contributing to a feature already in progress, you will modify the changie yaml file in `dbt/.changes/unreleased` related to your change. If you need help finding this file, please ask! +```bash +changie new +``` + +Commit the file that's created and your changelog entry is complete! + +If you are contributing to a feature already in progress, you will modify the changie yaml file in dbt/.changes/unreleased/ related to your change. If you need help finding this file, please ask within the discussion for the pull request! You don't need to worry about which `dbt-core` version your change will go into. Just create the changelog entry with `changie`, and open your PR against the `main` branch. All merged changes will be included in the next minor version of `dbt-core`. The Core maintainers _may_ choose to "backport" specific changes in order to patch older minor versions. In that case, a maintainer will take care of that backport after merging your PR, before releasing the new version of `dbt-core`. From 4a0da4ff825747c378ab5ff4321df96bf8e55166 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Mon, 12 Dec 2022 09:39:21 -0600 Subject: [PATCH 10/10] Update CONTRIBUTING.md Co-authored-by: Doug Beatty <44704949+dbeatty10@users.noreply.github.com> --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 27eacfbb14e..d3510aa5ff3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -209,7 +209,7 @@ Follow the steps to [install `changie`](https://changie.dev/guide/installation/) Once changie is installed and your PR is created for a new feature, simply run the following command and changie will walk you through the process of creating a changelog entry: -```bash +```shell changie new ```