From ead81e7d14cfd47a083fd7bf7bde7c19b413f080 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 25 Oct 2023 15:27:23 -0500 Subject: [PATCH 1/4] Switch to conda-build with libmamba solver --- conda_smithy/configure_feedstock.py | 8 +++----- news/libmamba.rst | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 news/libmamba.rst diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index 3fc2cd9e0..ac99a172e 100644 --- a/conda_smithy/configure_feedstock.py +++ b/conda_smithy/configure_feedstock.py @@ -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", # 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: diff --git a/news/libmamba.rst b/news/libmamba.rst new file mode 100644 index 000000000..b3ae98939 --- /dev/null +++ b/news/libmamba.rst @@ -0,0 +1,24 @@ +**Added:** + +* + +**Changed:** + +* The default build tool changed from conda-mambabuild to conda-build with + libmamba solver. + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* From 4069ec8d7c6a51a090b9e7a1c911845aa7f58f86 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 26 Oct 2023 15:00:45 -0500 Subject: [PATCH 2/4] Fix test --- tests/test_configure_feedstock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_configure_feedstock.py b/tests/test_configure_feedstock.py index 7c8f80ef4..f4603b2b1 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+conda-libmamba-solver" # current default # legacy compatibility config with open(os.path.join(config_yaml, "conda-forge.yml")) as fp: From b6768462643eb7dc0419e8bac1ff825eeb5d9813 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 26 Oct 2023 15:29:46 -0500 Subject: [PATCH 3/4] pre-commit --- tests/test_configure_feedstock.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_configure_feedstock.py b/tests/test_configure_feedstock.py index f4603b2b1..42f6e818d 100644 --- a/tests/test_configure_feedstock.py +++ b/tests/test_configure_feedstock.py @@ -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"] == "conda-build+conda-libmamba-solver" # 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: From f172497ad3f7a0672c0133136ea9247cb69dc03a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 27 Oct 2023 08:43:26 -0500 Subject: [PATCH 4/4] Make it easier to read --- conda_smithy/configure_feedstock.py | 2 +- tests/test_configure_feedstock.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index ac99a172e..0c026103d 100644 --- a/conda_smithy/configure_feedstock.py +++ b/conda_smithy/configure_feedstock.py @@ -1856,7 +1856,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-libmamba-solver", + "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 diff --git a/tests/test_configure_feedstock.py b/tests/test_configure_feedstock.py index 42f6e818d..e504869ad 100644 --- a/tests/test_configure_feedstock.py +++ b/tests/test_configure_feedstock.py @@ -879,7 +879,7 @@ def test_conda_build_tools(config_yaml): "build_with_mambabuild" not in cfg ) # superseded by conda_build_tool=mambabuild assert ( - cfg["conda_build_tool"] == "conda-build+conda-libmamba-solver" + cfg["conda_build_tool"] == "conda-build" ) # current default # legacy compatibility config