Merge branch 'main' into reverse

mamba-org · Jan 14, 2025 · 5a96f3a · 5a96f3a
2 parents ef45c80 + 0023a3b
commit 5a96f3a
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# 2025.01.14
+
+Release: 2.0.6.rc0 (libmamba, mamba, micromamba, libmambapy)
+
+Bug fixes:
+
+- [all] Correctly populate lists of `MatchSpec` in `MTransaction`'s history by @Hind-M in https://github.com/mamba-org/mamba/pull/3724
+- [all] Honour `CONDA_ENVS_PATH` again by @jjerphan in https://github.com/mamba-org/mamba/pull/3725
+- [all] Improve CUDA version detection by @jjerphan in https://github.com/mamba-org/mamba/pull/3700
+- [all] Support installation using explicit url by @Hind-M in https://github.com/mamba-org/mamba/pull/3710
+- [all] Improve display of environment activation message by @Hind-M in https://github.com/mamba-org/mamba/pull/3715
+- [all] Adapt warnings shown when several channels are used by @jjerphan in https://github.com/mamba-org/mamba/pull/3720
+- [all] Add a hint on cache corruption by @jjerphan in https://github.com/mamba-org/mamba/pull/3736
+- [all] Support more condarc paths by @SandrineP in https://github.com/mamba-org/mamba/pull/3695
+- [all] Always add `root_prefix/envs` in `envs_dirs` by @Hind-M in https://github.com/mamba-org/mamba/pull/3692
+- [mamba] Generate and install `etc/profile.d/mamba.sh` by @jjerphan in https://github.com/mamba-org/mamba/pull/3723
+- [mamba] Add `no-pip` flag to `list` command by @Hind-M in https://github.com/mamba-org/mamba/pull/3696
+- [mamba, micromamba] Options args enhancement by @Hind-M in https://github.com/mamba-org/mamba/pull/3722
+
+CI fixes and doc:
+
+- [all] Use a portable web request for Windows by @jjerphan in https://github.com/mamba-org/mamba/pull/3704
+- [all] Add prettier pre-commit hook by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3663
+- [all] Document slight differences for environment export by @jjerphan in https://github.com/mamba-org/mamba/pull/3697
+- [all] Unique Release Tag by @Klaim in https://github.com/mamba-org/mamba/pull/3732
+- [all] Update Linux installation script for Nushell by @deephbz in https://github.com/mamba-org/mamba/pull/3721
+- [all] `update_changelog.py` now can also take input as cli parameters by @Klaim in https://github.com/mamba-org/mamba/pull/3731
+
 # 2024.12.12
 
 Releases: libmamba 2.0.5, libmambapy 2.0.5, micromamba 2.0.5

diff --git a/libmamba/CHANGELOG.md b/libmamba/CHANGELOG.md
@@ -1,3 +1,26 @@
+# libmamba 2.0.6.rc0 (January 14, 2025)
+
+Bug fixes:
+
+- Correctly populate lists of `MatchSpec` in `MTransaction`'s history by @Hind-M in https://github.com/mamba-org/mamba/pull/3724
+- Honour `CONDA_ENVS_PATH` again by @jjerphan in https://github.com/mamba-org/mamba/pull/3725
+- Improve CUDA version detection by @jjerphan in https://github.com/mamba-org/mamba/pull/3700
+- Support installation using explicit url by @Hind-M in https://github.com/mamba-org/mamba/pull/3710
+- Improve display of environment activation message by @Hind-M in https://github.com/mamba-org/mamba/pull/3715
+- Adapt warnings shown when several channels are used by @jjerphan in https://github.com/mamba-org/mamba/pull/3720
+- Add a hint on cache corruption by @jjerphan in https://github.com/mamba-org/mamba/pull/3736
+- Support more condarc paths by @SandrineP in https://github.com/mamba-org/mamba/pull/3695
+- Always add `root_prefix/envs` in `envs_dirs` by @Hind-M in https://github.com/mamba-org/mamba/pull/3692
+
+CI fixes and doc:
+
+- Use a portable web request for Windows by @jjerphan in https://github.com/mamba-org/mamba/pull/3704
+- Add prettier pre-commit hook by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3663
+- Document slight differences for environment export by @jjerphan in https://github.com/mamba-org/mamba/pull/3697
+- Unique Release Tag by @Klaim in https://github.com/mamba-org/mamba/pull/3732
+- Update Linux installation script for Nushell by @deephbz in https://github.com/mamba-org/mamba/pull/3721
+- `update_changelog.py` now can also take input as cli parameters by @Klaim in https://github.com/mamba-org/mamba/pull/3731
+
 # libmamba 2.0.5 (December 12, 2024)
 
 Enhancements:

diff --git a/libmamba/include/mamba/version.hpp b/libmamba/include/mamba/version.hpp
@@ -12,13 +12,13 @@
 
 #define LIBMAMBA_VERSION_MAJOR 2
 #define LIBMAMBA_VERSION_MINOR 0
-#define LIBMAMBA_VERSION_PATCH 5
-#define LIBMAMBA_VERSION_IS_PRERELEASE 0
+#define LIBMAMBA_VERSION_PATCH 6
+#define LIBMAMBA_VERSION_IS_PRERELEASE 1
 #if LIBMAMBA_VERSION_IS_PRERELEASE == 1
-#define LIBMAMBA_VERSION_PRERELEASE_NAME ""
+#define LIBMAMBA_VERSION_PRERELEASE_NAME "rc0"
 #endif
 
-#define LIBMAMBA_VERSION_STRING "2.0.5"
+#define LIBMAMBA_VERSION_STRING "2.0.6.rc0"
 #define LIBMAMBA_VERSION                                                                           \
     (LIBMAMBA_VERSION_MAJOR * 10000 + LIBMAMBA_VERSION_MINOR * 100 + LIBMAMBA_VERSION_PATCH)
 

diff --git a/libmambapy/CHANGELOG.md b/libmambapy/CHANGELOG.md
@@ -1,3 +1,26 @@
+# libmambapy 2.0.6.rc0 (January 14, 2025)
+
+Bug fixes:
+
+- Correctly populate lists of `MatchSpec` in `MTransaction`'s history by @Hind-M in https://github.com/mamba-org/mamba/pull/3724
+- Honour `CONDA_ENVS_PATH` again by @jjerphan in https://github.com/mamba-org/mamba/pull/3725
+- Improve CUDA version detection by @jjerphan in https://github.com/mamba-org/mamba/pull/3700
+- Support installation using explicit url by @Hind-M in https://github.com/mamba-org/mamba/pull/3710
+- Improve display of environment activation message by @Hind-M in https://github.com/mamba-org/mamba/pull/3715
+- Adapt warnings shown when several channels are used by @jjerphan in https://github.com/mamba-org/mamba/pull/3720
+- Add a hint on cache corruption by @jjerphan in https://github.com/mamba-org/mamba/pull/3736
+- Support more condarc paths by @SandrineP in https://github.com/mamba-org/mamba/pull/3695
+- Always add `root_prefix/envs` in `envs_dirs` by @Hind-M in https://github.com/mamba-org/mamba/pull/3692
+
+CI fixes and doc:
+
+- Use a portable web request for Windows by @jjerphan in https://github.com/mamba-org/mamba/pull/3704
+- Add prettier pre-commit hook by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3663
+- Document slight differences for environment export by @jjerphan in https://github.com/mamba-org/mamba/pull/3697
+- Unique Release Tag by @Klaim in https://github.com/mamba-org/mamba/pull/3732
+- Update Linux installation script for Nushell by @deephbz in https://github.com/mamba-org/mamba/pull/3721
+- `update_changelog.py` now can also take input as cli parameters by @Klaim in https://github.com/mamba-org/mamba/pull/3731
+
 # libmambapy 2.0.5 (December 12, 2024)
 
 Enhancements:

diff --git a/libmambapy/src/libmambapy/version.py b/libmambapy/src/libmambapy/version.py
@@ -1,5 +1,5 @@
-version_info = ("2", "0", "5")
-version_prerelease = ""
+version_info = ("2", "0", "6")
+version_prerelease = "rc0"
 __version__ = ".".join(map(str, version_info))
 if version_prerelease != "":
     __version__ = f"{__version__}.{version_prerelease}"
diff --git a/micromamba/CHANGELOG.md b/micromamba/CHANGELOG.md
@@ -1,3 +1,27 @@
+# micromamba 2.0.6.rc0 (January 14, 2025)
+
+Bug fixes:
+
+- Correctly populate lists of `MatchSpec` in `MTransaction`'s history by @Hind-M in https://github.com/mamba-org/mamba/pull/3724
+- Honour `CONDA_ENVS_PATH` again by @jjerphan in https://github.com/mamba-org/mamba/pull/3725
+- Improve CUDA version detection by @jjerphan in https://github.com/mamba-org/mamba/pull/3700
+- Support installation using explicit url by @Hind-M in https://github.com/mamba-org/mamba/pull/3710
+- Improve display of environment activation message by @Hind-M in https://github.com/mamba-org/mamba/pull/3715
+- Adapt warnings shown when several channels are used by @jjerphan in https://github.com/mamba-org/mamba/pull/3720
+- Add a hint on cache corruption by @jjerphan in https://github.com/mamba-org/mamba/pull/3736
+- Support more condarc paths by @SandrineP in https://github.com/mamba-org/mamba/pull/3695
+- Always add `root_prefix/envs` in `envs_dirs` by @Hind-M in https://github.com/mamba-org/mamba/pull/3692
+- Options args enhancement by @Hind-M in https://github.com/mamba-org/mamba/pull/3722
+
+CI fixes and doc:
+
+- Use a portable web request for Windows by @jjerphan in https://github.com/mamba-org/mamba/pull/3704
+- Add prettier pre-commit hook by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3663
+- Document slight differences for environment export by @jjerphan in https://github.com/mamba-org/mamba/pull/3697
+- Unique Release Tag by @Klaim in https://github.com/mamba-org/mamba/pull/3732
+- Update Linux installation script for Nushell by @deephbz in https://github.com/mamba-org/mamba/pull/3721
+- `update_changelog.py` now can also take input as cli parameters by @Klaim in https://github.com/mamba-org/mamba/pull/3731
+
 # micromamba 2.0.5 (December 12, 2024)
 
 Enhancements:

diff --git a/micromamba/src/version.hpp b/micromamba/src/version.hpp
@@ -12,13 +12,13 @@
 
 #define UMAMBA_VERSION_MAJOR 2
 #define UMAMBA_VERSION_MINOR 0
-#define UMAMBA_VERSION_PATCH 5
-#define UMAMBA_VERSION_IS_PRERELEASE 0
+#define UMAMBA_VERSION_PATCH 6
+#define UMAMBA_VERSION_IS_PRERELEASE 1
 #if UMAMBA_VERSION_IS_PRERELEASE == 1
-#define UMAMBA_VERSION_PRERELEASE_NAME ""
+#define UMAMBA_VERSION_PRERELEASE_NAME "rc0"
 #endif
 
-#define UMAMBA_VERSION_STRING "2.0.5"
+#define UMAMBA_VERSION_STRING "2.0.6.rc0"
 #define UMAMBA_VERSION                                                                             \
     (UMAMBA_VERSION_MAJOR * 10000 + UMAMBA_VERSION_MINOR * 100 + UMAMBA_VERSION_PATCH)