Refactor for libmamba v2

.devcontainer/conda-forge/devcontainer.json

@@ -3,6 +3,9 @@
     "name": "Miniforge (default-channel=conda-forge)",
     "image": "condaforge/miniforge3:latest",
 
+    // Uncomment to force x64 instead of native (slower!)
+    // "runArgs": ["--platform=linux/amd64"],
+
     // Features to add to the dev container. More info: https://containers.dev/features.
     // "features": {},
 
@@ -31,7 +34,8 @@
             "extensions": [
                 "charliermarsh.ruff",
                 "eamodio.gitlens",
-                "ms-toolsai.jupyter"
+                "ms-toolsai.jupyter",
+                "be5invis.toml"
             ]
         }
     }

.devcontainer/defaults/devcontainer.json

@@ -3,6 +3,9 @@
     "name": "Miniconda (default-channel=defaults)",
     "image": "continuumio/miniconda3:latest",
 
+    // Uncomment to force x64 instead of native (slower!)
+    // "runArgs": ["--platform=linux/amd64"],
+
     // Features to add to the dev container. More info: https://containers.dev/features.
     // "features": {},
 
@@ -31,7 +34,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,30 @@ 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
-    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
+    sed '/sel(.*)/d' "\$environment_yaml" > /tmp/mamba-environment-dev.yml
+    # Environment.yml is missing make
+    echo "  - make" >> /tmp/mamba-environment-dev.yml
+    "$BASE_CONDA/condabin/conda" env update \
+      --quiet \
+      --prefix "$BASE_CONDA" \
+      --file /tmp/mamba-environment-dev.yml
     # 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 +65,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/builds-review.yaml

@@ -52,7 +52,7 @@ jobs:
           subdir: ${{ matrix.subdir }}
           anaconda-org-channel: conda-canary
           anaconda-org-label: '${{ github.event.repository.name }}-pr-${{ github.event.number }}'
-          anaconda-org-token: ${{ secrets.CONDA_CANARY_ANACONDA_ORG_TOKEN }}
+          anaconda-org-token: ${{ secrets.ANACONDA_ORG_CONDA_CANARY_TOKEN }}
           comment-headline: 'Review build status'
           comment-token: ${{ secrets.CANARY_ACTION_TOKEN }}
-          conda-build-arguments: '--override-channels -c conda-forge -c defaults'
+          conda-build-arguments: '--override-channels -c conda-forge/label/mamba_dev -c conda-forge'

.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
@@ -109,7 +109,9 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         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
@@ -257,7 +259,9 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         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
@@ -286,7 +290,8 @@ jobs:
 
       - name: Conda Install
         working-directory: conda
-        run: conda install
+        run: >
+          conda install
           --yes
           --file tests/requirements.txt
           --file tests/requirements-${{ runner.os }}.txt
@@ -534,7 +539,9 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         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
@@ -568,7 +575,8 @@ jobs:
       - name: Conda Install
         working-directory: conda # CONDA-LIBMAMBA-SOLVER CHANGE
         # CONDA-LIBMAMBA-SOLVER CHANGE: add conda-libmamba-solver requirements.txt
-        run: conda install
+        run: >
+          conda install
           --yes
           --file tests/requirements.txt
           --file tests/requirements-ci.txt

.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,46 +22,38 @@ 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.17.0
-    hooks:
-      - id: pyupgrade
-        args: ["--py38-plus"]
-        exclude: ^conda/exports.py
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
-    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
     rev: 1.18.0
     hooks:
+      # auto format Python codes within docstrings
       - id: blacken-docs
-        additional_dependencies: [black]
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
-    hooks:
-      - id: flake8
-  - repo: https://github.com/PyCQA/pylint
-    rev: v3.2.6
-    hooks:
-      - id: pylint
-        args: [--exit-zero]
-  - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.9
-    hooks:
-      - id: bandit
-        args: [--exit-zero]
-        # ignore all tests, not just tests data
-        exclude: ^tests/
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.5.7
+    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
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.5.5
     hooks:

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"):
+def get_solver_class(key: str = "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'")

conda_libmamba_solver/conda_build_exceptions.py

@@ -8,6 +8,7 @@
 conda_build is not a dependency, but we only import this when conda-build is calling the
 solver, so it's fine to import it here.
 """
+
 from conda_build.exceptions import DependencyNeedsBuildingError
 
 

conda_libmamba_solver/exceptions.py

@@ -1,6 +1,10 @@
 # Copyright (C) 2022 Anaconda, Inc
 # Copyright (C) 2023 conda
 # SPDX-License-Identifier: BSD-3-Clause
+"""
+Exceptions used in conda-libmamba-solver
+"""
+
 from conda.exceptions import UnsatisfiableError