Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update requirements #67

Merged
merged 8 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion conda_forge_feedstock_check_solvable/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# flake8: noqa
from ._version import __version__
from .check_solvable import is_recipe_solvable
from .mamba_solver import MambaSolver
9 changes: 6 additions & 3 deletions conda_forge_feedstock_check_solvable/check_solvable.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from ruamel.yaml import YAML

import conda_forge_feedstock_check_solvable.utils
from conda_forge_feedstock_check_solvable.mamba_solver import mamba_solver_factory
from conda_forge_feedstock_check_solvable.rattler_build import invoke_rattler_build
from conda_forge_feedstock_check_solvable.rattler_solver import rattler_solver_factory
from conda_forge_feedstock_check_solvable.utils import (
Expand Down Expand Up @@ -106,7 +105,7 @@ def _is_recipe_solvable(
additional_channels=(),
build_platform=None,
verbosity=1,
solver="mamba",
solver="rattler",
timeout_timer=None,
fail_fast=False,
) -> Tuple[bool, List[str], Dict[str, bool]]:
Expand Down Expand Up @@ -199,7 +198,7 @@ def _is_recipe_solvable_on_platform(
arch,
build_platform_arch=None,
additional_channels=(),
solver_backend="mamba",
solver_backend="rattler",
timeout_timer=None,
fail_fast=False,
):
Expand Down Expand Up @@ -308,6 +307,10 @@ def _is_recipe_solvable_on_platform(
if solver_backend == "rattler":
solver_factory = rattler_solver_factory
elif solver_backend == "mamba":
from conda_forge_feedstock_check_solvable.mamba_solver import (
mamba_solver_factory,
)

solver_factory = mamba_solver_factory
else:
raise ValueError(f"Unknown solver backend {solver_backend}")
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ conda
conda-package-handling
conda-smithy
conda-build
libmambapy>=1.5.1,<2.0a0
libmambapy>=2.0.5,<3.0a0
ruamel.yaml.jinja2
conda-forge-metadata>=0.2.0
conda-forge-metadata>=0.11.0
wurlitzer
requests
zstandard
boltons>=23.0.0
py-rattler>=0.6.2,<0.7a0
py-rattler>=0.9.0,<0.10a0
Loading