From 03bc10b7ff3d5522b9a7d3957550515d752182c3 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 14 Jan 2025 11:19:53 -0800 Subject: [PATCH 1/4] Updated authorship for 3.11.1 --- .authors.yml | 13 +++++++++---- .mailmap | 1 + AUTHORS.md | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.authors.yml b/.authors.yml index 1c39562ac..7eae8468b 100644 --- a/.authors.yml +++ b/.authors.yml @@ -264,7 +264,7 @@ github: chenghlee - name: conda-bot email: ad-team+condabot@anaconda.com - num_commits: 48 + num_commits: 50 first_commit: 2022-01-25 21:38:28 alternate_emails: - 18747875+conda-bot@users.noreply.github.com @@ -357,7 +357,7 @@ github: RahulARanger - name: Marco Esters email: mesters@anaconda.com - num_commits: 27 + num_commits: 31 first_commit: 2023-05-12 11:44:12 github: marcoesters - name: Darryl Miles @@ -372,7 +372,7 @@ github: deepeshaburse - name: pre-commit-ci[bot] email: 66853113+pre-commit-ci[bot]@users.noreply.github.com - num_commits: 29 + num_commits: 31 first_commit: 2023-05-02 12:01:43 github: pre-commit-ci[bot] - name: Matthias Kuhn @@ -382,6 +382,11 @@ github: m-kuhn - name: dependabot[bot] email: 49699333+dependabot[bot]@users.noreply.github.com - num_commits: 24 + num_commits: 29 github: dependabot[bot] first_commit: 2024-05-07 10:16:05 +- name: Julien Jerphanion + email: git@jjerphan.xyz + github: jjerphan + num_commits: 2 + first_commit: 2025-01-10 07:19:08 diff --git a/.mailmap b/.mailmap index 00ce2dd06..54df4cda3 100644 --- a/.mailmap +++ b/.mailmap @@ -38,6 +38,7 @@ Jean-Luc Stevens jlstevens JoelStansbury <48299585+JoelStansbury@users.noreply.github.com> John Kirkham Jonathan J. Helmus Jonathan Helmus +Julien Jerphanion Kale Franz Kale Franz Katherine Kinnaman Ken Odegard diff --git a/AUTHORS.md b/AUTHORS.md index 9e6c38841..037a68367 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -27,6 +27,7 @@ Authors are sorted alphabetically. * JoelStansbury * John Kirkham * Jonathan J. Helmus +* Julien Jerphanion * Kale Franz * Katherine Kinnaman * Ken Odegard @@ -65,5 +66,8 @@ Authors are sorted alphabetically. * XuehaiPan * astaric * bkreider +* conda-bot +* dependabot[bot] * guimondmm +* pre-commit-ci[bot] * y2kbugger From 824519de41162c7a6b4e000d38b1f831063c0319 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 14 Jan 2025 11:19:54 -0800 Subject: [PATCH 2/4] Updated CHANGELOG for 3.11.1 --- CHANGELOG.md | 25 +++++++++++++++++++++++++ news/913-uninstaller-cli-option-typo | 19 ------------------- news/914-shell-init-on-mamba-2 | 19 ------------------- news/915-installer-unattended-pkg | 19 ------------------- news/922-improve-jinja-integration | 19 ------------------- news/924-miniforge-example-update | 19 ------------------- 6 files changed, 25 insertions(+), 95 deletions(-) delete mode 100644 news/913-uninstaller-cli-option-typo delete mode 100644 news/914-shell-init-on-mamba-2 delete mode 100644 news/915-installer-unattended-pkg delete mode 100644 news/922-improve-jinja-integration delete mode 100644 news/924-miniforge-example-update diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aa75d74a..99957eed6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ [//]: # (current developments) +## 2025-01-14 3.11.1: +### Enhancements + +* Add `INSTALLER_UNATTENDED` environment variable for `pkg` installers. (#915) +* Improve use of Jinja for templating logic. (#901 via #922) + +### Bug fixes + +* Add support of mamba v2 shell initialization. (#914) + +### Docs + +* Fix typo for the `/RemoveConfigFiles` CLI option in the Windows uninstaller. (#913) +* Update miniforge example to 24.11.2 (#924) + +### Contributors + +* @jjerphan +* @marcoesters +* @conda-bot +* @dependabot[bot] +* @pre-commit-ci[bot] + + + ## 2024-12-05 3.11.0: ### Enhancements diff --git a/news/913-uninstaller-cli-option-typo b/news/913-uninstaller-cli-option-typo deleted file mode 100644 index 2c2e8f24a..000000000 --- a/news/913-uninstaller-cli-option-typo +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* Fix typo for the `/RemoveConfigFiles` CLI option in the Windows uninstaller. (#913) - -### Other - -* diff --git a/news/914-shell-init-on-mamba-2 b/news/914-shell-init-on-mamba-2 deleted file mode 100644 index 680d52dcc..000000000 --- a/news/914-shell-init-on-mamba-2 +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Add support of mamba v2 shell initialization. (#914) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/915-installer-unattended-pkg b/news/915-installer-unattended-pkg deleted file mode 100644 index 7de8c7c08..000000000 --- a/news/915-installer-unattended-pkg +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add `INSTALLER_UNATTENDED` environment variable for `pkg` installers. (#915) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/922-improve-jinja-integration b/news/922-improve-jinja-integration deleted file mode 100644 index ce3f65851..000000000 --- a/news/922-improve-jinja-integration +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Improve use of Jinja for templating logic. (#901 via #922) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/924-miniforge-example-update b/news/924-miniforge-example-update deleted file mode 100644 index bae72417e..000000000 --- a/news/924-miniforge-example-update +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* Update miniforge example to 24.11.2 (#924) - -### Other - -* From fe71b16e20b1a8e4b6f271ee9b9e72fbf4d0ae00 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 14 Jan 2025 11:21:35 -0800 Subject: [PATCH 3/4] Remove bot authors --- AUTHORS.md | 3 --- CHANGELOG.md | 3 --- 2 files changed, 6 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 037a68367..8cd712e97 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -66,8 +66,5 @@ Authors are sorted alphabetically. * XuehaiPan * astaric * bkreider -* conda-bot -* dependabot[bot] * guimondmm -* pre-commit-ci[bot] * y2kbugger diff --git a/CHANGELOG.md b/CHANGELOG.md index 99957eed6..ba5ab9c15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,9 +19,6 @@ * @jjerphan * @marcoesters -* @conda-bot -* @dependabot[bot] -* @pre-commit-ci[bot] From 8a8a5d5dc900c31b21a7a4fa2ac0968218f1cdad Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 14 Jan 2025 11:26:43 -0800 Subject: [PATCH 4/4] Add new contributor --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba5ab9c15..7ea98e090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,10 @@ * @marcoesters +### New contributors + +* @jjerphan made their first contribution in https://github.com/conda/constructor/pull/914 + ## 2024-12-05 3.11.0: ### Enhancements