Merge branch 'main' into info_base

.github/workflows/unix_impl.yml

@@ -107,7 +107,10 @@ jobs:
           python -m pip install --no-deps --no-build-isolation ./libmambapy
       - name: Run libmamba Python bindings tests
         run: |
-          python -m pytest libmambapy/tests/ ${{ runner.debug == 'true' && '-v' || '--exitfirst' }}
+          # Only rerun flaky tests on the `main` branch
+          python -m pytest libmambapy/tests/ \
+              ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} \
+              ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}
 
   mamba_integration_tests_unix:
     name: mamba integration tests
@@ -162,8 +165,10 @@ jobs:
         run: |
           export TEST_MAMBA_EXE=$(pwd)/build/micromamba/mamba
           unset CONDARC  # Interferes with tests
+          # Only rerun flaky tests on the `main` branch
           python -m pytest micromamba/tests/ \
-            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }}
+              ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} \
+              ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}
 
   verify_pkg_tests:
     name: mamba-content-trust tests

.github/workflows/windows_impl.yml

@@ -116,7 +116,10 @@ jobs:
           python -m pip install --no-deps --no-build-isolation ./libmambapy
       - name: Run libmamba Python bindings tests
         run: |
-          python -m pytest libmambapy/tests/ ${{ runner.debug == 'true' && '-v' || '--exitfirst' }}
+          # Only rerun flaky tests on the `main` branch
+          python -m pytest libmambapy/tests/ ^
+            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} ^
+            ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}
 
   mamba_integration_tests_win:
     name: mamba integration tests
@@ -149,5 +152,7 @@ jobs:
           $env:TEST_MAMBA_EXE = Join-Path -Path $pwd -ChildPath 'local\bin\mamba.exe'
           $env:MAMBA_TEST_SHELL_TYPE='powershell'
           Remove-Item -Path "env:CONDARC"
+          # Only rerun flaky tests on the `main` branch
           python -m pytest micromamba/tests/ `
-            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }}
+            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} `
+            ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}

.readthedocs.yml

@@ -1,5 +1,9 @@
 version: 2
 
+sphinx:
+  # Path to Sphinx configuration file
+  configuration: docs/source/conf.py
+
 build:
   os: "ubuntu-22.04"
   tools:

CHANGELOG.md

@@ -1,3 +1,93 @@
+# 2025.02.04
+
+Release: 2.0.6 (libmamba, mamba, micromamba, libmambapy)
+
+Enhancements:
+
+- [all] Add reverse flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3705
+- [all] Add md5 flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3773
+- [all] add canonical flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3777
+
+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
+- [all] Support globs in `MatchSpec` build strings by @jjerphan in https://github.com/mamba-org/mamba/pull/3735
+- [all] Don't encode URLs for `mamba env export --explicit` by @maresb in https://github.com/mamba-org/mamba/pull/3745
+- [all] Handle `git+https` pip urls by @Hind-M in https://github.com/mamba-org/mamba/pull/3764
+- [all] Uncomment no more failing test by @Hind-M in https://github.com/mamba-org/mamba/pull/3767
+- [all] Use CA certificates from `conda-forge::ca-certificates` by @jjerphan in https://github.com/mamba-org/mamba/pull/3765
+- [all] Add explicit flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3760
+- [all] Fix dependency and `subdir` in repoquery `whoneeds` by @Hind-M in https://github.com/mamba-org/mamba/pull/3743
+- [all] Use `LOG_DEBUG` for CUDA version detection by @jjerphan in https://github.com/mamba-org/mamba/pull/3757
+- [all] Add missing thread and undefined sanitizers CMake options by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3753
+- [all] Factor handling of `GetModuleFileNameW` by @jjerphan in https://github.com/mamba-org/mamba/pull/3785
+- [all] Adapt root prefix determination by @jjerphan in https://github.com/mamba-org/mamba/pull/3782
+- [all] Remove pip warning for `PIP_NO_PYTHON_VERSION_WARNING` by @Hind-M in https://github.com/mamba-org/mamba/pull/3770
+- [all] Use `libmamba`'s installation instead of `mamba`'s as a fallback by @jjerphan in https://github.com/mamba-org/mamba/pull/3792
+- [mamba] Warn about future removal of `etc/profile.d/mamba.sh` by @jjerphan in https://github.com/mamba-org/mamba/pull/3788
+- [all] Fix typo in Windows workflows by @jjerphan in https://github.com/mamba-org/mamba/pull/3793
+- [all] Rerun pytest tests on `main` in case of failures by @jjerphan in https://github.com/mamba-org/mamba/pull/3769
+
+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
+
+Maintenance:
+
+- [all] `list` refactoring by @SandrineP in https://github.com/mamba-org/mamba/pull/3768
+- [all] Correctly exclude json files in clang-format by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3749
+- [all] Fix build status badge by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3755
+- [all] Don't exclude Changelog files from typos-conda by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3748
+- [all] Update pre-commit hooks by by @mathbunnyru https://github.com/mamba-org/mamba/pull/3746
+
+# 2025.02.04
+
+Release: 2.0.6.rc3 (libmamba, mamba, micromamba, libmambapy)
+
+Enhancement:
+
+- [all] add canonical flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3777
+
+Bug fixes:
+
+- [all] Use `libmamba`'s installation instead of `mamba`'s as a fallback by @jjerphan in https://github.com/mamba-org/mamba/pull/3792
+
+Maintenance:
+
+- [mamba] Warn about future removal of `etc/profile.d/mamba.sh` by @jjerphan in https://github.com/mamba-org/mamba/pull/3788
+- [all] Fix typo in Windows workflows by @jjerphan in https://github.com/mamba-org/mamba/pull/3793
+- [all] Rerun pytest tests on `main` in case of failures by @jjerphan in https://github.com/mamba-org/mamba/pull/3769
+
+# 2025.01.31
+
+Release: 2.0.6.rc2 (libmamba, mamba, micromamba, libmambapy)
+
+Enhancements:
+
+- [all] Add md5 flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3773
+
+Bug fixes:
+
+- [all] Factor handling of `GetModuleFileNameW` by @jjerphan in https://github.com/mamba-org/mamba/pull/3785
+- [all] Adapt root prefix determination by @jjerphan in https://github.com/mamba-org/mamba/pull/3782
+- [all] Remove pip warning for `PIP_NO_PYTHON_VERSION_WARNING` by @Hind-M in https://github.com/mamba-org/mamba/pull/3770
+
 # 2025.01.28
 
 Release: 2.0.6.rc1 (libmamba, mamba, micromamba, libmambapy)

dev/environment-dev.yml

@@ -31,6 +31,7 @@ dependencies:
   - pytest-asyncio
   - pytest-timeout
   - pytest-xprocess
+  - pytest-rerunfailures
   - memory_profiler
   - requests
   - sel(win): pywin32

docs/source/developer_zone/changes-2.0.rst

@@ -19,7 +19,7 @@ Mamba (executable)
 has been entirely replaced by the dynamically linked version of ``micromamba``,
 a statically-linked ELF based on ``libmamba``.
 
-Hence ``mamba``` now has the exact same user interface and experience as ``micromamba``.
+Hence ``mamba`` now has the exact same user interface and experience as ``micromamba``.
 
 .. warning::
 
@@ -40,6 +40,9 @@ Breaking changes include:
 - A new config ``order_solver_request`` (default true) can be used to order the dependencies passed
   to the solver, getting order independent solutions.
 - Support for complex match specs such as ``pkg[md5=0000000000000]`` and ``pkg[build='^\d*$']``.
+- **Temporary regression:** Lost support for leading and internal globs in
+  version strings (via redesigned ``VersionSpec``, which no longer handles
+  version strings as a regex). Only trailing globs are supported at the moment.
 
 .. TODO OCI and mirrors
 
@@ -86,6 +89,9 @@ Changes include:
   - The redesign of ``MatchSpec``.
     The module also includes a platform enumeration, an implementation of ordered ``Version``,
     and a ``VersionSpec`` to match versions.
+    **Breaking change (temporary regression):** ``VersionSpec`` lost support for
+    leading and internal globs in version strings because they are no longer
+    handled as a regex. Only trailing globs are supported at the moment.
   - ``PackageInfo`` has been moved to this submodule.
     Some attributes have been given a more explicit name ``fn`` > ``filename``,
     ``url`` > ``package_url``.
@@ -127,6 +133,11 @@ The main changes are:
   - A refactoring of a purely functional ``Channel`` class,
   - Implementation of a ``UnresolvedChannel`` to describe unresolved ``Channels``,
   - A refactored and complete implementation of ``MatchSpec`` using the components above.
+  - **Breaking change (temporary regression):** ``VersionSpec`` lost support for
+    leading and internal globs in version strings because they are no longer
+    handled as a regex. Only trailing globs are supported at the moment. This
+    affects version strings in both the command-line interface and recipe
+    requirements.
 
 - A cleanup of ``ChannelContext`` to be a light proxy and parameter holder wrapping the
   ``specs::Channel``.

libmamba/CHANGELOG.md

@@ -1,3 +1,82 @@
+# libmamba 2.0.6 (February 04, 2025)
+
+Enhancements:
+
+- Add reverse flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3705
+- Add md5 flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3773
+- add canonical flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3777
+
+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
+- Support globs in `MatchSpec` build strings by @jjerphan in https://github.com/mamba-org/mamba/pull/3735
+- Don't encode URLs for `mamba env export --explicit` by @maresb in https://github.com/mamba-org/mamba/pull/3745
+- Handle `git+https` pip urls by @Hind-M in https://github.com/mamba-org/mamba/pull/3764
+- Uncomment no more failing test by @Hind-M in https://github.com/mamba-org/mamba/pull/3767
+- Use CA certificates from `conda-forge::ca-certificates` by @jjerphan in https://github.com/mamba-org/mamba/pull/3765
+- Add explicit flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3760
+- Fix dependency and `subdir` in repoquery `whoneeds` by @Hind-M in https://github.com/mamba-org/mamba/pull/3743
+- Use `LOG_DEBUG` for CUDA version detection by @jjerphan in https://github.com/mamba-org/mamba/pull/3757
+- Add missing thread and undefined sanitizers CMake options by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3753
+- Factor handling of `GetModuleFileNameW` by @jjerphan in https://github.com/mamba-org/mamba/pull/3785
+- Adapt root prefix determination by @jjerphan in https://github.com/mamba-org/mamba/pull/3782
+- Remove pip warning for `PIP_NO_PYTHON_VERSION_WARNING` by @Hind-M in https://github.com/mamba-org/mamba/pull/3770
+- Use `libmamba`'s installation instead of `mamba`'s as a fallback by @jjerphan in https://github.com/mamba-org/mamba/pull/3792
+- Fix typo in Windows workflows by @jjerphan in https://github.com/mamba-org/mamba/pull/3793
+- Rerun pytest tests on `main` in case of failures by @jjerphan in https://github.com/mamba-org/mamba/pull/3769
+
+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
+
+Maintenance:
+
+- `list` refactoring by @SandrineP in https://github.com/mamba-org/mamba/pull/3768
+- Correctly exclude json files in clang-format by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3749
+- Fix build status badge by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3755
+- Don't exclude Changelog files from typos-conda by @mathbunnyru in https://github.com/mamba-org/mamba/pull/3748
+- Update pre-commit hooks by by @mathbunnyru https://github.com/mamba-org/mamba/pull/3746
+
+# libmamba 2.0.6.rc3 (February 04, 2025)
+
+Enhancement:
+
+- add canonical flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3777
+
+Bug fixes:
+
+- Use `libmamba`'s installation instead of `mamba`'s as a fallback by @jjerphan in https://github.com/mamba-org/mamba/pull/3792
+
+Maintenance:
+
+- Fix typo in Windows workflows by @jjerphan in https://github.com/mamba-org/mamba/pull/3793
+- Rerun pytest tests on `main` in case of failures by @jjerphan in https://github.com/mamba-org/mamba/pull/3769
+
+# libmamba 2.0.6.rc2 (January 31, 2025)
+
+Enhancements:
+
+- [all] Add md5 flag to list command by @SandrineP in https://github.com/mamba-org/mamba/pull/3773
+
+Bug fixes:
+
+- [all] Factor handling of `GetModuleFileNameW` by @jjerphan in https://github.com/mamba-org/mamba/pull/3785
+- [all] Adapt root prefix determination by @jjerphan in https://github.com/mamba-org/mamba/pull/3782
+- [all] Remove pip warning for `PIP_NO_PYTHON_VERSION_WARNING` by @Hind-M in https://github.com/mamba-org/mamba/pull/3770
+
 # libmamba 2.0.6.rc1 (January 28, 2025)
 
 Enhancements:

libmamba/include/mamba/version.hpp

@@ -13,12 +13,12 @@
 #define LIBMAMBA_VERSION_MAJOR 2
 #define LIBMAMBA_VERSION_MINOR 0
 #define LIBMAMBA_VERSION_PATCH 6
-#define LIBMAMBA_VERSION_IS_PRERELEASE 1
+#define LIBMAMBA_VERSION_IS_PRERELEASE 0
 #if LIBMAMBA_VERSION_IS_PRERELEASE == 1
-#define LIBMAMBA_VERSION_PRERELEASE_NAME "rc1"
+#define LIBMAMBA_VERSION_PRERELEASE_NAME ""
 #endif
 
-#define LIBMAMBA_VERSION_STRING "2.0.6.rc1"
+#define LIBMAMBA_VERSION_STRING "2.0.6"
 #define LIBMAMBA_VERSION                                                                           \
     (LIBMAMBA_VERSION_MAJOR * 10000 + LIBMAMBA_VERSION_MINOR * 100 + LIBMAMBA_VERSION_PATCH)