Merge branch 'main' into 3830-monkeypatch

Author: jjerphan

.github/workflows/brew.yml

@@ -35,8 +35,13 @@ jobs:
       - name: Checkout mamba repository
         uses: actions/checkout@v4
 
+      # Note: cmake already installed from a local Github tap
+      # Attempting to install it from homebrew/core creates a conflict without more handling
       - name: Install host and build dependencies
-        run: brew install fmt libarchive libsolv lz4 openssl@3 reproc simdjson xz yaml-cpp zstd cmake cli11 nlohmann-json spdlog tl-expected pkgconfig python
+        run: >
+          brew install --overwrite
+          fmt libarchive libsolv lz4 openssl@3 reproc simdjson xz yaml-cpp zstd
+          cli11 nlohmann-json spdlog tl-expected pkgconfig python
 
       - name: Configure to build mamba
         run: >

.github/workflows/linters.yml

@@ -23,11 +23,11 @@ jobs:
       PRE_COMMIT_USE_MICROMAMBA: 1
     steps:
       - uses: actions/checkout@v4
-      - name: Install pre-commit
+      - name: Install pre-commit and identify
         uses: mamba-org/setup-micromamba@v2
         with:
           environment-name: linters
-          create-args: pre-commit
+          create-args: pre-commit identify
       - name: Add micromamba to GITHUB_PATH
         run: echo "${HOME}/micromamba-bin" >> $GITHUB_PATH
       - name: Run all linters

.github/workflows/set_pr_label.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Assign label based on PR title
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -54,7 +54,7 @@ jobs:
             }
 
       - name: Assign label based on PR description
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/static_build.yml

@@ -45,6 +45,17 @@ jobs:
         run: |
           cd micromamba-feedstock/
           sed -i '' '/conda_forge_output_validation/d' conda-forge.yml
+      - name: Replaces python 3.9 with 3.13
+        if: ${{ matrix.platform == 'linux' }}
+        run: |
+          cd micromamba-feedstock/recipe/
+          sed -i 's|    - micromamba{{ bin_ext }} create -n test --override-channels -c conda-forge --yes python=3\.9|    - micromamba{{ bin_ext }} create -n test --override-channels -c conda-forge --yes python=3.13|' meta.yaml
+      - name: Uses libcurl 8.14
+        if: ${{ matrix.platform == 'linux' }}
+        run: |
+          cd micromamba-feedstock/recipe/
+          sed -i 's|    - libcurl >=8\.4\.0[[:space:]]*# \[unix\]|    - libcurl >=8.4,<8.15    #[unix]|' meta.yaml
+          sed -i 's|    - libcurl-static >=8\.4\.0[[:space:]]*# \[unix\]|    - libcurl-static >=8.4,<8.15    #[unix]|' meta.yaml
       - name: Checkout mamba branch
         uses: actions/checkout@v4
         with:
@@ -115,14 +126,14 @@ jobs:
         if: failure()
         run: tar -czf ${{ github.workspace }}/micromamba-conda-build-failed-${{ matrix.platform }}-${{ matrix.arch }}.tar.gz $MAMBA_ROOT_PREFIX/envs/mambabuild/conda-bld/micromamba_*
       - name: Upload conda build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: micromamba-conda-build-failed-${{ matrix.platform }}-${{ matrix.arch }}
           path: ${{ github.workspace }}/micromamba-conda-build-failed-${{ matrix.platform }}-${{ matrix.arch }}.tar.gz
           retention-days: 7
       - name: Upload micromamba
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: micromamba-${{ matrix.platform }}-${{ matrix.arch }}
           path: ${{ github.workspace }}/artifacts/micromamba
@@ -199,13 +210,13 @@ jobs:
           ${{ github.workspace }}/build/micromamba/micromamba.exe list -n testenv -r ./test_prefix  --log-level 1
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: micromamba-build-failed-win-64
           path: ${{ github.workspace }}/micromamba-build-failed-win-64.tar.gz
           retention-days: 7
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: micromamba-win-64
           path: ${{ github.workspace }}/build/micromamba/micromamba.exe

.github/workflows/unix_impl.yml

@@ -82,6 +82,11 @@ jobs:
         run: |
           unset CONDARC  # Interferes with tests
           ./build/libmamba/tests/test_libmamba
+      - name: Run libmamba logging system tests
+        shell: bash -elo pipefail {0}
+        run: |
+          unset CONDARC  # Interferes with tests
+          ./build/libmamba/tests/test_libmamba_logging
 
   libmambapy_tests_unix:
     name: libmambapy tests

.github/workflows/windows_impl.yml

@@ -84,6 +84,11 @@ jobs:
         shell: bash -elo pipefail {0}
         run: |
           ./build/libmamba/ext/solv-cpp/tests/test_solv_cpp
+      - name: Run libmamba logging system tests
+        shell: bash -elo pipefail {0}
+        run: |
+          unset CONDARC  # Interferes with tests
+          cd ./build/libmamba && ./tests/test_libmamba_logging
       - name: Run libmamba tests
         shell: bash -elo pipefail {0}
         run: |

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: libmamba/tests/data/repodata_json_cache*
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -10,7 +10,7 @@ repos:
         language_version: python3
   # Autoformat: YAML, JSON, Markdown, etc.
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.4.2
+    rev: v3.6.2
     hooks:
       - id: prettier
   - repo: https://github.com/pre-commit/pygrep-hooks
@@ -20,29 +20,29 @@ repos:
       - id: rst-directive-colons
       - id: rst-inline-touching-normal
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.17.1
+    rev: v0.18.1
     hooks:
       - id: markdownlint-cli2
         args: [--fix]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.21.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.1
+    rev: v0.14.0
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
         exclude_types: [pyi]
       - id: ruff-format
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.19.1
+    rev: 1.20.0
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==24.10.0]
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.7
+    rev: v21.1.2
     hooks:
       - id: clang-format
         args: [--style=file]
@@ -52,7 +52,7 @@ repos:
     hooks:
       - id: cmake-format
   - repo: https://github.com/Quantco/pre-commit-mirrors-typos
-    rev: 1.29.4
+    rev: 1.33.1
     hooks:
       - id: typos-conda
         # In case of ambiguity (multiple possible corrections), `typos` will just report it to the user and move on without applying/writing any changes.

CHANGELOG.md

@@ -1,3 +1,155 @@
+## 2025.11.21
+
+Release: 2.4.0 (libmamba, mamba, micromamba, libmambapy)
+
+Enhancements:
+
+- [micromamba, libmamba] Support for `mambajs`'s environment lockfile format by @Klaim in <https://github.com/mamba-org/mamba/pull/4085>
+- [all] Logging impl separation by @Klaim in <https://github.com/mamba-org/mamba/pull/4016>
+
+Bug fixes:
+
+- [micromamba] fix: Update URL of lock files by @jjerphan in <https://github.com/mamba-org/mamba/pull/4097>
+- [micromamba] Fix Windows tests by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4086>
+
+Maintenance:
+
+- [all] build(deps): bump actions/upload-artifact from 4 to 5 by @app/dependabot in <https://github.com/mamba-org/mamba/pull/4088>
+- [libmamba] Removed deprecated libcurl backend by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4083>
+
+## 2025.11.18
+
+Release: 2.4.0.rc0 (libmamba, mamba, micromamba, libmambapy)
+
+Enhancements:
+
+- [libmamba, micromamba] Support for `mambajs`'s environment lockfile format by @Klaim in <https://github.com/mamba-org/mamba/pull/4085>
+- [all] Logging impl separation by @Klaim in <https://github.com/mamba-org/mamba/pull/4016>
+
+Bug fixes:
+
+- [micromamba] fix: Update URL of lock files by @jjerphan in <https://github.com/mamba-org/mamba/pull/4097>
+- [micromamba] Fix Windows tests by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4086>
+
+Maintenance:
+
+- [all] build(deps): bump actions/upload-artifact from 4 to 5 by @app/dependabot in <https://github.com/mamba-org/mamba/pull/4088>
+- [libmamba] Removed deprecated libcurl backend by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4083>
+
+## 2025.10.17
+
+Release: 2.3.3 (libmamba, mamba, micromamba, libmambapy)
+
+Bug fixes:
+
+- [libmamba] fix: pass `$argv` for fish wrapper by @sghng in <https://github.com/mamba-org/mamba/pull/4073>
+- [libmamba] Fix empty depends/constrains when installing explicit spec files by @benmoss in <https://github.com/mamba-org/mamba/pull/4071>
+- [libmamba] fix: proxy both micromamba and mamba with fish function by @sghng in <https://github.com/mamba-org/mamba/pull/4065>
+- [libmamba] Fix nodiscard errors by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4058>
+- [libmambapy] Fix deprecated license key by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4053>
+
+CI fixes and doc:
+
+- [all] Added lower bounds on spdlog and fmt by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4080>
+- [all] Static Windows build fix by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4074>
+
+Maintenance:
+
+- [all] maint: Auto-update `pre-commit` setup by @jjerphan in <https://github.com/mamba-org/mamba/pull/4079>
+- [micromamba] Fixed test_repodata_record_patch by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4067>
+- [all] build(deps): bump actions/github-script from 7 to 8 by @app/dependabot in <https://github.com/mamba-org/mamba/pull/4063>
+- [libmambapy] Use fmt::format by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4061>
+- [libmambapy] Move to Pybind 3.0 by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4059>
+- [libmambapy, libmamba] libmambapy: Switch build backend to `scikit-build-core` by @LecrisUT in <https://github.com/mamba-org/mamba/pull/3802>
+
+## 2025.10.14
+
+Release: 2.3.3.alpha1 (libmamba, mamba, micromamba, libmambapy)
+
+Bug fixes:
+
+- [libmamba] fix: pass `$argv` for fish wrapper by @sghng in <https://github.com/mamba-org/mamba/pull/4073>
+- [libmamba] Fix empty depends/constrains when installing explicit spec files by @benmoss in <https://github.com/mamba-org/mamba/pull/4071>
+- [libmamba] fix: proxy both micromamba and mamba with fish function by @sghng in <https://github.com/mamba-org/mamba/pull/4065>
+- [libmamba] Fix nodiscard errors by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4058>
+- [libmambapy] Fix deprecated license key by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4053>
+
+CI fixes and doc:
+
+- [all] Added lower bounds on spdlog and fmt by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4080>
+- [all] Static Windows build fix by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4074>
+
+Maintenance:
+
+- [all] maint: Auto-update `pre-commit` setup by @jjerphan in <https://github.com/mamba-org/mamba/pull/4079>
+- [micromamba] Fixed test_repodata_record_patch by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4067>
+- [all] build(deps): bump actions/github-script from 7 to 8 by @app/dependabot in <https://github.com/mamba-org/mamba/pull/4063>
+- [libmambapy] Use fmt::format by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4061>
+- [libmambapy] Move to Pybind 3.0 by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4059>
+- [libmamba, libmambapy] libmambapy: Switch build backend to `scikit-build-core` by @LecrisUT in <https://github.com/mamba-org/mamba/pull/3802>
+
+## 2025.09.04
+
+Release: 2.3.3.alpha0 (libmamba, mamba, micromamba, libmambapy)
+
+Bug fixes:
+
+- [libmamba] Fix nodiscard errors by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4058>
+- [libmambapy] Fix deprecated license key by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4053>
+
+Maintenance:
+
+- [libmambapy] Use fmt::format by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4061>
+- [libmambapy] Move to Pybind 3.0 by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4059>
+- [libmamba, libmambapy] libmambapy: Switch build backend to `scikit-build-core` by @LecrisUT in <https://github.com/mamba-org/mamba/pull/3802>
+
+## 2025.08.26
+
+Release: 2.3.2 (libmamba, mamba, micromamba, libmambapy)
+
+Enhancements:
+
+- [all] feat: Support for optional `python_site_packages_path` in repodata by @jjhelmus in <https://github.com/mamba-org/mamba/pull/3579>
+
+Bug fixes:
+
+- [libmamba] Fix libsolv MatchSpec parsing by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4046>
+- [all] fix: Workaround `mamba-org/mamba#4043` by @jjerphan in <https://github.com/mamba-org/mamba/pull/4044>
+- [libmamba] Fix string lookup in MatchSpec parsing by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4040>
+- [libmamba] Fix wrong sticky package hash by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4039>
+
+Maintenance:
+
+- [libmamba] `synchronized_value` move and copy implementation by @Klaim in <https://github.com/mamba-org/mamba/pull/4042>
+
+## 2025.07.28
+
+Release: 2.3.1 (libmamba, mamba, micromamba, libmambapy)
+
+Enhancements:
+
+- [libmambapy, libmamba] Add missing bindings and other improvements by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/3990>
+
+Bug fixes:
+
+- [libmamba, micromamba] Consider `SHELL` env var by @Hind-M in <https://github.com/mamba-org/mamba/pull/3997>
+
+CI fixes and doc:
+
+- [all] [skip ci] Fix typo by @davidbrochart in <https://github.com/mamba-org/mamba/pull/4000>
+- [all] ci: use VS2022 instead of VS2019 by @Klaim in <https://github.com/mamba-org/mamba/pull/3986>
+
+Maintenance:
+
+- [libmamba] fix CI issues related to moving dependencies by @Klaim in <https://github.com/mamba-org/mamba/pull/4023>
+- [libmamba] maint: use `synchronized_value` where we use a mutex to protect data by @Klaim in <https://github.com/mamba-org/mamba/pull/3992>
+- [libmambapy] maint: handle `fmt>=11.2` by @Klaim in <https://github.com/mamba-org/mamba/pull/4001>
+- [libmambapy] Handle removed `is_rgb` from `fmt 11.2.0` by @Hind-M in <https://github.com/mamba-org/mamba/pull/3998>
+- [libmamba] Replace macros used in tests for compatibility with coverage report by @jjerphan in <https://github.com/mamba-org/mamba/pull/3995>
+- [libmamba] maint: fixes warnings by @Klaim in <https://github.com/mamba-org/mamba/pull/3993>
+- [libmamba] `synchronized_value` by @Klaim in <https://github.com/mamba-org/mamba/pull/3984>
+- [libmamba] maintenance: fixed msvc warnings about unreachable code by @Klaim in <https://github.com/mamba-org/mamba/pull/3991>
+
 ## 2025.06.16
 
 Release: 2.3.0 (libmamba, mamba, micromamba, libmambapy)

_typos.toml

@@ -5,3 +5,4 @@ pn = "pn"
 Ome = "Ome"
 haa = "haa"
 "fo" = "fo"
+"ba" = "ba"

dev/CMakePresetsMamba.json

@@ -23,7 +23,8 @@
     {
       "cacheVariables": {
         "BUILD_MICROMAMBA": "ON",
-        "BUILD_STATIC": "ON"
+        "BUILD_STATIC": "ON",
+        "ENABLE_WIN32_XMLLITE": "ON"
       },
       "hidden": true,
       "name": "mamba-static"