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

Jump to bottom

Change default build tool to conda-build again #1844

Merged
merged 3 commits into from
Feb 21, 2024
Merged

Change default build tool to conda-build again #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d95f25
Change default build tool to conda-build again
mbargull Feb 20, 2024
3be461c
Update tests and news for conda_build_tool change
mbargull Feb 20, 2024
1806bd9
Add conda-build>=24.1 to default remote_ci_setup
mbargull Feb 21, 2024
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
4 changes: 2 additions & 2 deletions conda_smithy/configure_feedstock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,15 +1946,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": "conda-build",
"conda_install_tool": "mamba",
"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=4"],
"remote_ci_setup": ["conda-forge-ci-setup=4", "conda-build>=24.1"],
}

if forge_yml is None:
Expand Down
23 changes: 23 additions & 0 deletions news/1844-conda_build_tool-conda-build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* Default build tool changed from conda-mambabuild to conda-build again. (#1844)

**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" # current default

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