Merge branch 'main' into fix-etc/profile.d

Author: flying-sheep

.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/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,74 @@
+## 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)

_typos.toml

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

dev/environment-dev.yml

@@ -14,7 +14,7 @@ dependencies:
   - make # not always present
   # libmamba dependencies
   - cpp-expected
-  - fmt >=11.1.0
+  - fmt >=12.0.0
   # As of libarchive 3.8, builds of libarchive for different licenses
   # are available. We use the LGPL version here.
   - libarchive>=3.8 lgpl_*
@@ -24,7 +24,7 @@ dependencies:
   - nlohmann_json
   - reproc-cpp >=14.2.4.post0
   - simdjson >=3.3.0
-  - spdlog
+  - spdlog >=1.16.0
   - yaml-cpp >=0.8.0
   - sel(win): winreg
   # libmamba test dependencies

libmamba/CHANGELOG.md

@@ -1,3 +1,55 @@
+## libmamba 2.4.0.rc0 (November 18, 2025)
+
+Enhancements:
+
+- Support for `mambajs`'s environment lockfile format by @Klaim in <https://github.com/mamba-org/mamba/pull/4085>
+- Logging impl separation by @Klaim in <https://github.com/mamba-org/mamba/pull/4016>
+
+Maintenance:
+
+- build(deps): bump actions/upload-artifact from 4 to 5 by @app/dependabot in <https://github.com/mamba-org/mamba/pull/4088>
+- Removed deprecated libcurl backend by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4083>
+
+## libmamba 2.3.3 (October 17, 2025)
+
+Bug fixes:
+
+- fix: pass `$argv` for fish wrapper by @sghng in <https://github.com/mamba-org/mamba/pull/4073>
+- Fix empty depends/constrains when installing explicit spec files by @benmoss in <https://github.com/mamba-org/mamba/pull/4071>
+- fix: proxy both micromamba and mamba with fish function by @sghng in <https://github.com/mamba-org/mamba/pull/4065>
+- Fix nodiscard errors by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4058>
+
+CI fixes and doc:
+
+- Added lower bounds on spdlog and fmt by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4080>
+- Static Windows build fix by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4074>
+
+Maintenance:
+
+- maint: Auto-update `pre-commit` setup by @jjerphan in <https://github.com/mamba-org/mamba/pull/4079>
+- build(deps): bump actions/github-script from 7 to 8 by @app/dependabot in <https://github.com/mamba-org/mamba/pull/4063>
+- libmambapy: Switch build backend to `scikit-build-core` by @LecrisUT in <https://github.com/mamba-org/mamba/pull/3802>
+
+## libmamba 2.3.3.alpha1 (October 14, 2025)
+
+Bug fixes:
+
+- fix: pass `$argv` for fish wrapper by @sghng in <https://github.com/mamba-org/mamba/pull/4073>
+- Fix empty depends/constrains when installing explicit spec files by @benmoss in <https://github.com/mamba-org/mamba/pull/4071>
+- fix: proxy both micromamba and mamba with fish function by @sghng in <https://github.com/mamba-org/mamba/pull/4065>
+- Fix nodiscard errors by @AntoinePrv in <https://github.com/mamba-org/mamba/pull/4058>
+
+CI fixes and doc:
+
+- Added lower bounds on spdlog and fmt by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4080>
+- Static Windows build fix by @JohanMabille in <https://github.com/mamba-org/mamba/pull/4074>
+
+Maintenance:
+
+- maint: Auto-update `pre-commit` setup by @jjerphan in <https://github.com/mamba-org/mamba/pull/4079>
+- build(deps): bump actions/github-script from 7 to 8 by @app/dependabot in <https://github.com/mamba-org/mamba/pull/4063>
+- libmambapy: Switch build backend to `scikit-build-core` by @LecrisUT in <https://github.com/mamba-org/mamba/pull/3802>
+
 ## libmamba 2.3.3.alpha0 (September 04, 2025)
 
 Bug fixes:

libmamba/CMakeLists.txt

@@ -222,13 +222,18 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/core/context.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/download_progress_bar.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/env_lockfile.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/env_lockfile_impl.hpp
+    ${LIBMAMBA_SOURCE_DIR}/core/env_lockfile_conda.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/env_lockfile_mambajs.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/environments_manager.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/error_handling.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/execution.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/fsutil.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/history.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/link.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/link.hpp
+    ${LIBMAMBA_SOURCE_DIR}/core/logging.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/logging_spdlog.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/menuinst.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/output.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/package_cache.cpp
@@ -366,7 +371,6 @@ set(
     # Core API (low-level)
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/activation.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/channel_context.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/common_types.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/context.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/context_params.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/download_progress_bar.hpp
@@ -377,6 +381,9 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/fsutil.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/history.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/invoke.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/logging.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/logging_spdlog.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/logging_tools.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/menuinst.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/output.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_cache.hpp