From 831caa5a4dc39132877cc97317be5dc09207188c Mon Sep 17 00:00:00 2001 From: jaimergp Date: Fri, 12 Jan 2024 11:33:21 +0100 Subject: [PATCH] Prepare 3.6.0 (#746) * Updated authorship for 3.6.0 * Updated CHANGELOG for 3.6.0 * amend changelog --- .authors.yml | 8 ++++---- CHANGELOG.md | 19 +++++++++++++++++++ news/474-menuinst-v2 | 20 -------------------- news/739-ruamel-yaml | 19 ------------------- news/745-customize-pkg-domains | 19 ------------------- 5 files changed, 23 insertions(+), 62 deletions(-) delete mode 100644 news/474-menuinst-v2 delete mode 100644 news/739-ruamel-yaml delete mode 100644 news/745-customize-pkg-domains diff --git a/.authors.yml b/.authors.yml index e5f88bee5..8c8a101bb 100644 --- a/.authors.yml +++ b/.authors.yml @@ -264,7 +264,7 @@ github: chenghlee - name: conda-bot email: ad-team+condabot@anaconda.com - num_commits: 28 + num_commits: 30 first_commit: 2022-01-25 21:38:28 alternate_emails: - 18747875+conda-bot@users.noreply.github.com @@ -277,7 +277,7 @@ aliases: - Jaime RGP - jaimergp - num_commits: 60 + num_commits: 62 first_commit: 2022-01-08 14:56:53 github: jaimergp - name: Tom Hören @@ -357,7 +357,7 @@ github: RahulARanger - name: Marco Esters email: mesters@anaconda.com - num_commits: 8 + num_commits: 9 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: 10 + num_commits: 13 first_commit: 2023-05-02 12:01:43 github: pre-commit-ci[bot] - name: Matthias Kuhn diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b6b3515b..6f99fac55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ [//]: # (current developments) +## 2024-01-12 3.6.0: +### Enhancements + +* Add support for `menuinst` v2, which extends shortcut (menu items) creation from Windows to Linux and macOS. See [`menuinst` documentation](https://conda.github.io/menuinst/) for more information. Note that this feature requires `conda-standalone 23.11.0` or later. `micromamba` doesn't support v2-style menu items yet. (#474, #743) +* Add support for `ruamel.yaml` 0.18 API. (#729 via #739) +* Add `pkg_domains` setting to allow customization of the `domains` attribute in `PKG` installers. (#731 via #744) + +### Other + +* Unix installers now bundle conda-standalone (or micromamba) as `_conda`, instead of `conda.exe`. + (#741 via #474) + +### Contributors + +* @jaimergp +* @marcoesters + + + ## 2023-10-10 3.5.0: ### Enhancements diff --git a/news/474-menuinst-v2 b/news/474-menuinst-v2 deleted file mode 100644 index e67c9d6f1..000000000 --- a/news/474-menuinst-v2 +++ /dev/null @@ -1,20 +0,0 @@ -### Enhancements - -* Add support for `menuinst` v2, which extends shortcut (menu items) creation from Windows to Linux and macOS. See [`menuinst` documentation](https://conda.github.io/menuinst/) for more information. Note that this feature requires `conda-standalone 23.11.0` or later. `micromamba` doesn't support v2-style menu items yet. (#474, #743) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Unix installers now bundle conda-standalone (or micromamba) as `_conda`, instead of `conda.exe`. - (#741 via #474) diff --git a/news/739-ruamel-yaml b/news/739-ruamel-yaml deleted file mode 100644 index eb7a044f5..000000000 --- a/news/739-ruamel-yaml +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add support for `ruamel.yaml` 0.18 API. (#729 via #739) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/745-customize-pkg-domains b/news/745-customize-pkg-domains deleted file mode 100644 index 8e8f4991e..000000000 --- a/news/745-customize-pkg-domains +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add `pkg_domains` setting to allow customization of the `domains` attribute in `PKG` installers. (#731 via #744) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -*