Refactor for libmamba v2 (WIP)

.devcontainer/conda-forge/devcontainer.json

@@ -31,7 +31,8 @@
             "extensions": [
                 "charliermarsh.ruff",
                 "eamodio.gitlens",
-                "ms-toolsai.jupyter"
+                "ms-toolsai.jupyter",
+                "be5invis.toml"
             ]
         }
     }

.devcontainer/defaults/devcontainer.json

@@ -31,7 +31,8 @@
             "extensions": [
                 "charliermarsh.ruff",
                 "eamodio.gitlens",
-                "ms-toolsai.jupyter"
+                "ms-toolsai.jupyter",
+                "be5invis.toml"
             ]
         }
     }

.devcontainer/post_create.sh

@@ -38,4 +38,5 @@ echo "Installing dev & test dependencies..."
     --file="$SRC_CONDA/tests/requirements-Linux.txt" \
     --file="$SRC_CONDA/tests/requirements-s3.txt" \
     --file="$SRC_CONDA_LIBMAMBA_SOLVER/dev/requirements.txt" \
-    --file="$SRC_CONDA_LIBMAMBA_SOLVER/tests/requirements.txt"
+    --file="$SRC_CONDA_LIBMAMBA_SOLVER/tests/requirements.txt"\
+    pre-commit

.devcontainer/post_start.sh

@@ -23,19 +23,28 @@ function develop-mamba() (
     echo "Miniconda not compatible with develop-mamba"
     exit 1
   fi
-  if [ ! -f "$SRC_MAMBA/mamba/setup.py" ]; then
-    echo "Mamba 1.x not found at $SRC_MAMBA"
+  if [ ! -f "$SRC_MAMBA/libmamba/CMakeLists.txt" ]; then
+    echo "Could not find mamba-org/mamba at $SRC_MAMBA"
     exit 1
   fi
+  if [ -f "$SRC_MAMBA/mamba/setup.py" ]; then
+    echo "Mamba 1.x found at $SRC_MAMBA"
+    mamba_version=1
+    environment_yaml="$SRC_MAMBA/mamba/environment-dev.yml"
+  else
+    echo "Mamba 2.x found at $SRC_MAMBA"
+    environment_yaml="$SRC_MAMBA/dev/environment-dev.yml"
+    mamba_version=2
+  fi
   # Install mamba dev dependencies only once:
   if [ ! -f ~/.mamba-develop-installed ]; then
     # remove "sel(win)" in environment yaml hack since conda does not understand
     # libmamba specific specs
-    echo "Installing mamba 1.x in dev mode..."
-    sed '/sel(.*)/d' "$SRC_MAMBA/mamba/environment-dev.yml" > /tmp/mamba-environment-dev.yml
+    sed '/sel(.*)/d' "\$environment_yaml" > /tmp/mamba-environment-dev.yml
+    # Environment.yml is missing make
+    echo "  - make" >> /tmp/mamba-environment-dev.yml
     CONDA_QUIET=1 "$BASE_CONDA/condabin/conda" env update -p "$BASE_CONDA" \
         --file /tmp/mamba-environment-dev.yml
-    "$BASE_CONDA/condabin/conda" install make -yq  # missing in mamba's dev env
     # Clean build directory to avoid issues with stale build files
     test -f "$SRC_MAMBA/build/CMakeCache.txt" && rm -rf "$SRC_MAMBA/build"
   fi
@@ -54,7 +63,11 @@ function develop-mamba() (
   make install -C build/
   cd -
   "$BASE_CONDA/bin/pip" install -e "$SRC_MAMBA/libmambapy/" --no-deps
-  test -f "$BASE_CONDA/conda-meta/mamba-"*".json" && "$BASE_CONDA/bin/pip" install -e "$SRC_MAMBA/mamba/" --no-deps
+  if [ "\$mamba_version" == "1" ]; then
+    test -f "$BASE_CONDA/conda-meta/mamba-"*".json" && "$BASE_CONDA/bin/pip" install -e "$SRC_MAMBA/mamba/" --no-deps
+  else
+    echo "Mamba binary installation not supported yet"
+  fi
   touch ~/.mamba-develop-installed || true
 )
 EOF

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ concurrency:
 env:
   # https://conda.github.io/conda-libmamba-solver/user-guide/configuration/#advanced-options
   CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED: true
-  PYTEST_RERUN_FAILURES: 3
+  PYTEST_RERUN_FAILURES: 0
   # See https://github.com/conda/conda/pull/13694
   # we can't break classic from here; no need to test it
   # those tests will still be available for local debugging if necessary
@@ -108,7 +108,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          repository: conda/conda  # CONDA-LIBMAMBA-SOLVER CHANGE
+          # repository: conda/conda  # CONDA-LIBMAMBA-SOLVER CHANGE
+          repository: jaimergp/conda  # TEMPORARY
+          ref: libmamba-v2-fixes  # TEMPORARY
           path: conda  # CONDA-LIBMAMBA-SOLVER CHANGE
 
       # CONDA-LIBMAMBA-SOLVER CHANGE
@@ -256,7 +258,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          repository: conda/conda  # CONDA-LIBMAMBA-SOLVER CHANGE
+          # repository: conda/conda  # CONDA-LIBMAMBA-SOLVER CHANGE
+          repository: jaimergp/conda  # TEMPORARY
+          ref: libmamba-v2-fixes  # TEMPORARY
           path: conda  # CONDA-LIBMAMBA-SOLVER CHANGE
 
       # CONDA-LIBMAMBA-SOLVER CHANGE
@@ -533,7 +537,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          repository: conda/conda  # CONDA-LIBMAMBA-SOLVER CHANGE
+          # repository: conda/conda  # CONDA-LIBMAMBA-SOLVER CHANGE
+          repository: jaimergp/conda  # TEMPORARY
+          ref: libmamba-v2-fixes  # TEMPORARY
           path: conda  # CONDA-LIBMAMBA-SOLVER CHANGE
 
       # CONDA-LIBMAMBA-SOLVER CHANGE
@@ -709,7 +715,7 @@ jobs:
         include:
           - runner: ubuntu-latest
             subdir: linux-64
-          - runner: macos-latest
+          - runner: macos-13
             subdir: osx-64
           - runner: macos-14
             subdir: osx-arm64

.pre-commit-config.yaml

@@ -2,12 +2,16 @@
 ci:
   autofix_prs: false
 # generally speaking we ignore all vendored code as well as tests data
+# TODO: Restore index and solver exclude lines before merge
 exclude: |
   (?x)^(
-    tests/data/ |
+    tests/data/.* |
+    conda_libmamba_solver/_index_v1\.py |
+    conda_libmamba_solver/_solver_v1\.py |
     conda_libmamba_solver/mamba_utils\.py
-  )/
+  )$
 repos:
+  # generic verification and formatting
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
     hooks:
@@ -18,50 +22,35 @@ repos:
       # ensure syntaxes are valid
       - id: check-toml
       - id: check-yaml
-        exclude: ^(recipe/meta.yaml|tests/data/)
+        exclude: |
+          (?x)^(
+            (conda\.)?recipe/meta.yaml
+          )
       # catch git merge/rebase problems
       - id: check-merge-conflict
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
-    hooks:
-      - id: pyupgrade
-        args: ["--py38-plus"]
-        exclude: ^conda/exports.py
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
-        exclude: tests/_reposerver\.py
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        exclude: tests/_reposerver\.py
-  - repo: https://github.com/asottile/blacken-docs
+  - repo: https://github.com/adamchainz/blacken-docs
     rev: 1.16.0
     hooks:
+      # auto format Python codes within docstrings
       - id: blacken-docs
-        additional_dependencies: [black]
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
-    hooks:
-      - id: flake8
-  - repo: https://github.com/PyCQA/pylint
-    rev: v3.1.0
-    hooks:
-      - id: pylint
-        args: [--exit-zero]
-  - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.8
-    hooks:
-      - id: bandit
-        args: [--exit-zero]
-        # ignore all tests, not just tests data
-        exclude: ^tests/
-  - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.5.5
-    hooks:
-      - id: insert-license
-        files: \.py$
-        args: [--license-filepath, .github/disclaimer.txt, --no-extra-eol]
-        exclude: ^(tests/repodata_time_machine.py|mamba_utils\.py|tests/channel_testing/helpers\.py|tests/channel_testing/reposerver\.py)  # extend global exclude
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.4
+    hooks:
+      # lint & attempt to correct failures (e.g. pyupgrade)
+      - id: ruff
+        args: [--fix]
+      # compatible replacement for black
+      - id: ruff-format
+  - repo: meta
+    # see https://pre-commit.com/#meta-hooks
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
+  - repo: local
+    hooks:
+      - id: git-diff
+        name: git diff
+        entry: git diff --exit-code
+        language: system
+        pass_filenames: false
+        always_run: true

_v2_changes_.md

@@ -0,0 +1,12 @@
+# Libmamba v2 integration changes
+
+- Deprecate CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED. No longer needed with v2.
+- Typing in all methods
+- time_recorder for metadata collection and solving loop
+- removed state.BaseIndexHelper
+- The libmamba v1 "pool" (collection of "repos"; repo = loaded repodata.json) is now a "database" of "RepoInfo" objects.
+- Do use current_repodata.json if explicitly set in CLI
+- Move to Ruff for pre-commit linting & formatting
+- Logging from libsolv has a big overhead now because it goes from C to C++ to Python to logging to stdout instead of C -> stdout.
+- Allow uninstall was previously set to false (only true for conda remove), and we set it up for individual solver jobs involving updates or conflicts. With v2, we have individual control over what to "Keep" instead of drop. This required marking important updates as keepers instead. Otherwise they would be uninstalled.
+- Other changes in the test suite discussed in https://github.com/conda/conda/pull/13784

conda_libmamba_solver/__init__.py

@@ -12,20 +12,10 @@
     except ImportError:
         __version__ = "0.0.0.unknown"
 
-from warnings import warn as _warn
-
-from .solver import LibMambaSolver
-
 
 def get_solver_class(key="libmamba"):
     if key == "libmamba":
-        return LibMambaSolver
-    if key == "libmamba-draft":
-        _warn(
-            "The 'libmamba-draft' solver has been deprecated. "
-            "The 'libmamba' solver will be used instead. "
-            "Please consider updating your code to remove this warning. "
-            "Using 'libmamba-draft' will result in an error in a future release.",
-        )
+        from .solver import LibMambaSolver
+
         return LibMambaSolver
     raise ValueError("Key must be 'libmamba'")