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..8cd712e97 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aa75d74a..7ea98e090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ [//]: # (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 + + +### New contributors + +* @jjerphan made their first contribution in https://github.com/conda/constructor/pull/914 + + ## 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 - -*