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.

Sign up for GitHub

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

Switch to conda-build with libmamba solver #1786

Merged
merged 4 commits into from
Oct 30, 2023
Merged

Switch to conda-build with libmamba solver #1786

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ead81e7
Switch to conda-build with libmamba solver
isuruf Oct 25, 2023
4069ec8
Fix test
isuruf Oct 26, 2023
b676846
pre-commit
isuruf Oct 26, 2023
f172497
Make it easier to read
isuruf Oct 27, 2023
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
8 changes: 3 additions & 5 deletions conda_smithy/configure_feedstock.py
View file
Open in desktop
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-libmamba-solver",
"conda_install_tool": "mamba",
"conda_install_tool_deps": "mamba",
"conda_solver": None,
"conda_solver": "libmamba",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is redundant right now. We can get by with either just conda_build_tool: conda-build + conda_solver: libmamba or conda_build_tool: conda-build+conda-libmamba-solver + conda_solver: None.

It's also ok to leave it like it's right now (doesn't hurt), but in case someone was wondering whether the two are needed: the answer is no.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the first is better from a readability standpoint?

# 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
View file
Open in desktop
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>
2 changes: 1 addition & 1 deletion tests/test_configure_feedstock.py
View file
Open in desktop
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"] == "mambabuild" # current default
assert cfg["conda_build_tool"] == "conda-build+conda-libmamba-solver" # current default

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