From 31ad0c3b8ab0640778cec75cd36b49de61365068 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Nov 2024 13:15:02 -0600 Subject: [PATCH 1/6] Update .authors.yml --- .authors.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.authors.yml b/.authors.yml index 85de92f3a8..7f8752a48b 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1469,3 +1469,6 @@ num_commits: 1 first_commit: 2024-06-07 11:14:31 github: carterbox +- name: Cornelius Roemer + email: cornelius.roemer@gmail.com + github: corneliusroemer From 7393823bda053b4534f10ce53a3392415e665eea Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Nov 2024 13:15:12 -0600 Subject: [PATCH 2/6] Updated authorship for 24.11.2 --- .authors.yml | 4 +++- .mailmap | 1 + AUTHORS.md | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.authors.yml b/.authors.yml index 7f8752a48b..e2eb67663e 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1202,7 +1202,7 @@ alternate_emails: - clee@anaconda.com - name: Ken Odegard - num_commits: 228 + num_commits: 229 email: kodegard@anaconda.com first_commit: 2020-09-08 19:53:41 github: kenodegard @@ -1472,3 +1472,5 @@ - name: Cornelius Roemer email: cornelius.roemer@gmail.com github: corneliusroemer + num_commits: 1 + first_commit: 2024-11-26 11:16:47 diff --git a/.mailmap b/.mailmap index 258c625856..b75caa38d0 100644 --- a/.mailmap +++ b/.mailmap @@ -61,6 +61,7 @@ Conda Bot <18747875+conda-bot@users.noreply.github.com> conda-bot <18747875+cond Conda Bot <18747875+conda-bot@users.noreply.github.com> conda bot Conda Bot <18747875+conda-bot@users.noreply.github.com> conda bot <18747875+conda-bot@users.noreply.github.com> Connor Martin +Cornelius Roemer Crystal Soja csoja Dan Blanchard Daniel Blanchard Dan Blanchard Daniel Blanchard diff --git a/AUTHORS.md b/AUTHORS.md index 8953b0b356..3adbcbe823 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -47,6 +47,7 @@ Authors are sorted alphabetically. * Christopher Whelan * Conda Bot * Connor Martin +* Cornelius Roemer * Crystal Soja * Dan Blanchard * Dan Lovell From 2cbdfcf29cbdb72a8cce7c33a9d6a49ed143ab4f Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Nov 2024 13:15:14 -0600 Subject: [PATCH 3/6] Updated CHANGELOG for 24.11.2 --- CHANGELOG.md | 13 +++++++++++++ news/5417-fix-str-copy.rst | 19 ------------------- 2 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 news/5417-fix-str-copy.rst diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d9e0ab989..b09e133e20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ [//]: # (current developments) +## 24.11.2 (2024-11-26) + +### Bug fixes + +* Fixed a bug where ``.copy()`` was used on a string instead of ``copy()`` when processing variants. (#5417) + +### Contributors + +* @corneliusroemer +* @kenodegard + + + ## 24.11.1 (2024-11-21) ### Bug fixes diff --git a/news/5417-fix-str-copy.rst b/news/5417-fix-str-copy.rst deleted file mode 100644 index ddac53eedc..0000000000 --- a/news/5417-fix-str-copy.rst +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fixed a bug where ``.copy()`` was used on a string instead of ``copy()`` when processing variants. (#5417) - -### Deprecations - -* - -### Docs - -* - -### Other - -* From 6bc5220451218d15bf5294b8689e18ef291da829 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Nov 2024 13:16:27 -0600 Subject: [PATCH 4/6] Add first-time contributions --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b09e133e20..2513091488 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Contributors -* @corneliusroemer +* @corneliusroemer made their first contribution in https://github.com/conda/conda-build/pull/5417 * @kenodegard From b49a9108b77ce71eb38a6afc778fbbdc4206178d Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Nov 2024 13:18:43 -0600 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2513091488..abd31cd796 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Bug fixes -* Fixed a bug where ``.copy()`` was used on a string instead of ``copy()`` when processing variants. (#5417) +* Fix bug where ``.copy()`` was used on a string instead of ``copy()`` when processing variants. (#5417) ### Contributors From afb6b9851764bc0b51ae2e09c2a637481336bd97 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Nov 2024 13:42:58 -0600 Subject: [PATCH 6/6] Update CHANGELOG.md Co-authored-by: Bianca Henderson --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abd31cd796..79226dafbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Bug fixes -* Fix bug where ``.copy()`` was used on a string instead of ``copy()`` when processing variants. (#5417) +* Fix bug where `.copy()` was used on a string instead of `copy()` when processing variants. (#5417) ### Contributors