Skip to content

Commit

Permalink
Merge pull request #1807 from mbargull/conda_build_tool-mambabuild
Browse files Browse the repository at this point in the history
Set conda_build_tool: mambabuild as default again
  • Loading branch information
isuruf authored Nov 23, 2023
2 parents f7e68c1 + 1a0283a commit 3cd248c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,7 @@ def _load_forge_config(forge_dir, exclusive_config_file, forge_yml=None):
"conda_forge_output_validation": False,
"private_upload": False,
"secrets": [],
"conda_build_tool": "conda-build",
"conda_build_tool": "mambabuild",
"conda_install_tool": "mamba",
"conda_solver": "libmamba",
# feedstock checkout git clone depth, None means keep default, 0 means no limit
Expand Down
24 changes: 24 additions & 0 deletions news/conda_build_tool-mambabuild.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
**Added:**

* <news item>

**Changed:**

* Set ``conda_build_tool: mambabuild`` as default again until
https://github.com/conda/conda-libmamba-solver/issues/393 is fixed (#1807).

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
2 changes: 1 addition & 1 deletion tests/test_configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ 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"] == "conda-build" # current default
assert cfg["conda_build_tool"] == "mambabuild" # current default

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

0 comments on commit 3cd248c

Please sign in to comment.