Skip to content

Commit

Permalink
Merge pull request #1786 from isuruf/libmamba
Browse files Browse the repository at this point in the history
Switch to conda-build with libmamba solver
  • Loading branch information
isuruf authored Oct 30, 2023
2 parents 1374e1f + f172497 commit fb33967
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 6 deletions.
8 changes: 3 additions & 5 deletions conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -1856,17 +1856,15 @@ def _load_forge_config(forge_dir, exclusive_config_file, forge_yml=None):
"conda_forge_output_validation": False,
"private_upload": False,
"secrets": [],
"conda_build_tool": "mambabuild",
"conda_build_tool_deps": "boa",
"conda_build_tool": "conda-build",
"conda_install_tool": "mamba",
"conda_install_tool_deps": "mamba",
"conda_solver": None,
"conda_solver": "libmamba",
# feedstock checkout git clone depth, None means keep default, 0 means no limit
"clone_depth": None,
# Specific channel for package can be given with
# ${url or channel_alias}::package_name
# defaults to conda-forge channel_alias
"remote_ci_setup": ["conda-forge-ci-setup=3"],
"remote_ci_setup": ["conda-forge-ci-setup=4"],
}

if forge_yml is None:
Expand Down
24 changes: 24 additions & 0 deletions news/libmamba.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
**Added:**

* <news item>

**Changed:**

* The default build tool changed from conda-mambabuild to conda-build with
libmamba solver.

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
4 changes: 3 additions & 1 deletion tests/test_configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,9 @@ def test_conda_build_tools(config_yaml):
assert (
"build_with_mambabuild" not in cfg
) # superseded by conda_build_tool=mambabuild
assert cfg["conda_build_tool"] == "mambabuild" # current default
assert (
cfg["conda_build_tool"] == "conda-build"
) # current default

# legacy compatibility config
with open(os.path.join(config_yaml, "conda-forge.yml")) as fp:
Expand Down

0 comments on commit fb33967

Please sign in to comment.