From 462ac10bde8dc1562af48cb0eadb441dad67cd64 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Wed, 29 May 2024 18:26:45 +0200 Subject: [PATCH 1/2] CI: Test with current conda-canary (2024-05) Signed-off-by: Marcel Bargull From 51d73f53baeb8606e6922a71dd862d2b3e2e6788 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Sat, 1 Jun 2024 18:04:54 +0200 Subject: [PATCH 2/2] tests: Use "cxx_compiler: [vs2022]" on Windows refs: - https://github.com/conda-forge/vc-feedstock/issues/78 Signed-off-by: Marcel Bargull --- tests/test_boa_build.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/test_boa_build.py b/tests/test_boa_build.py index 79008d56..9dc72014 100644 --- a/tests/test_boa_build.py +++ b/tests/test_boa_build.py @@ -14,16 +14,20 @@ tests_dir = pathlib.Path(__file__).parent / "tests-v2" -def test_build_recipes(): +def test_build_recipes(tmp_path: Path): recipes = [str(x) for x in recipes_dir.iterdir() if x.is_dir()] + cbc_yaml = tmp_path / "conda_build_config.yaml" + cbc_yaml.write_text("cxx_compiler: # [win]\n- vs2022 # [win]\n") for recipe in recipes: - check_call(["boa", "build", recipe]) + check_call(["boa", "build", "-m", str(cbc_yaml), recipe]) -def test_build_notest(): +def test_build_notest(tmp_path: Path): recipes = [str(x) for x in recipes_dir.iterdir() if x.is_dir()] recipe = recipes[0] - check_call(["boa", "build", recipe, "--no-test"]) + cbc_yaml = tmp_path / "conda_build_config.yaml" + cbc_yaml.write_text("cxx_compiler: # [win]\n- vs2022 # [win]\n") + check_call(["boa", "build", "-m", str(cbc_yaml), recipe, "--no-test"]) def test_run_exports(tmp_path: Path):