From d70dc4e823132bfa6b352a576779655148d02d75 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Mon, 22 Apr 2024 13:55:17 -0500 Subject: [PATCH 1/2] pin proto-types to match proto pin (#9999) (#10005) # Conflicts: # dev-requirements.txt --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index a7957634c9e..759682d3ad7 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -29,7 +29,7 @@ types-freezegun types-Jinja2 types-jsonschema types-mock -types-protobuf +types-protobuf>=4.0.0,<5.0.0 types-python-dateutil types-pytz types-requests<2.31.0 # types-requests 2.31.0.8 requires urllib3>=2, but we pin urllib3 ~= 1.0 because of openssl requirement for requests From 7122b31326d87ebc84b33d4670374abc81bbd991 Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Mon, 22 Apr 2024 14:17:58 -0500 Subject: [PATCH 2/2] Fix changlogs, remove PR reference (#9887) (#9996) * stop referencing PRs * convert PR to Issue in older yaml # Conflicts: # .changes/1.8.0/Dependencies-20231005-151848.yaml # .changes/1.8.0/Dependencies-20231031-131954.yaml # .changes/1.8.0/Dependencies-20231106-130051.yaml # .changes/1.8.0/Dependencies-20231122-001840.yaml # .changes/1.8.0/Dependencies-20231204-000945.yaml # .changes/1.8.0/Dependencies-20231211-005651.yaml # .changes/1.8.0/Dependencies-20240115-012030.yaml # .changes/1.8.0/Dependencies-20240123-105843.yaml # .changes/1.8.0/Dependencies-20240129-005734.yaml # .changes/1.8.0/Dependencies-20240129-005743.yaml # .changes/1.8.0/Dependencies-20240212-011324.yaml # .changes/1.8.0/Dependencies-20240222-102947.yaml # .changes/1.8.0/Dependencies-20240226-004412.yaml # .changes/1.8.0/Dependencies-20240226-123502.yaml # .changes/1.8.0/Dependencies-20240227-151115.yaml # .changes/1.8.0/Security-20240222-152445.yaml # .changes/unreleased/Dependencies-20240117-100818.yaml --- .changie.yaml | 52 +++-------------------------- .github/workflows/bot-changelog.yml | 2 +- 2 files changed, 5 insertions(+), 49 deletions(-) diff --git a/.changie.yaml b/.changie.yaml index ba0590da8d3..23e802f190d 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -31,43 +31,7 @@ kinds: - {{.Body}} ({{ range $index, $element := $IssueList }}{{if $index}}, {{end}}{{$element}}{{end}}) - label: Under the Hood - label: Dependencies - 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: string - minLength: 1 - label: Security - 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: string - minLength: 1 newlines: afterChangelogHeader: 1 @@ -106,18 +70,10 @@ footerFormat: | {{- $changeList := splitList " " $change.Custom.Author }} {{- $IssueList := list }} {{- $changeLink := $change.Kind }} - {{- if or (eq $change.Kind "Dependencies") (eq $change.Kind "Security") }} - {{- $changes := splitList " " $change.Custom.PR }} - {{- range $issueNbr := $changes }} - {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/pull/nbr)" | replace "nbr" $issueNbr }} - {{- $IssueList = append $IssueList $changeLink }} - {{- end -}} - {{- else }} - {{- $changes := splitList " " $change.Custom.Issue }} - {{- range $issueNbr := $changes }} - {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/issues/nbr)" | replace "nbr" $issueNbr }} - {{- $IssueList = append $IssueList $changeLink }} - {{- end -}} + {{- $changes := splitList " " $change.Custom.Issue }} + {{- range $issueNbr := $changes }} + {{- $changeLink := "[#nbr](https://github.com/dbt-labs/dbt-core/issues/nbr)" | replace "nbr" $issueNbr }} + {{- $IssueList = append $IssueList $changeLink }} {{- end }} {{- /* check if this contributor has other changes associated with them already */}} {{- if hasKey $contributorDict $author }} diff --git a/.github/workflows/bot-changelog.yml b/.github/workflows/bot-changelog.yml index 07e978d6229..ba63413b5cc 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 PR: ${{ github.event.pull_request.number }}" + custom_changelog_string: "custom:\n Author: ${{ github.event.pull_request.user.login }}\n Issue: ${{ github.event.pull_request.number }}"