From 6d95f25284e10b3d5f77908cbd92a6709c500a67 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Tue, 20 Feb 2024 17:29:32 +0100 Subject: [PATCH 1/3] Change default build tool to conda-build again Signed-off-by: Marcel Bargull --- conda_smithy/configure_feedstock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index f4efce315..6c76e130e 100644 --- a/conda_smithy/configure_feedstock.py +++ b/conda_smithy/configure_feedstock.py @@ -1946,7 +1946,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": "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 From 3be461cfb3a5f1e746fc7b2f7a70f2228e553c05 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Tue, 20 Feb 2024 17:53:09 +0100 Subject: [PATCH 2/3] Update tests and news for conda_build_tool change Signed-off-by: Marcel Bargull --- news/1844-conda_build_tool-conda-build | 23 +++++++++++++++++++++++ tests/test_configure_feedstock.py | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 news/1844-conda_build_tool-conda-build diff --git a/news/1844-conda_build_tool-conda-build b/news/1844-conda_build_tool-conda-build new file mode 100644 index 000000000..089b67509 --- /dev/null +++ b/news/1844-conda_build_tool-conda-build @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* Default build tool changed from conda-mambabuild to conda-build again. (#1844) + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/tests/test_configure_feedstock.py b/tests/test_configure_feedstock.py index 7c8f80ef4..26f2901f0 100644 --- a/tests/test_configure_feedstock.py +++ b/tests/test_configure_feedstock.py @@ -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: From 1806bd91c1858d6a21b49293306a824384b761f4 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Wed, 21 Feb 2024 17:54:08 +0100 Subject: [PATCH 3/3] Add conda-build>=24.1 to default remote_ci_setup Signed-off-by: Marcel Bargull --- conda_smithy/configure_feedstock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index 6c76e130e..74c6a2e3d 100644 --- a/conda_smithy/configure_feedstock.py +++ b/conda_smithy/configure_feedstock.py @@ -1954,7 +1954,7 @@ def _load_forge_config(forge_dir, exclusive_config_file, forge_yml=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: