From 62a5efd8af0b0b6663f3db908e8fbed5da13d0ff Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Wed, 9 Oct 2024 16:44:47 +0200 Subject: [PATCH] simpler fix for npw --- test-data/recipes/env_vars/recipe.yaml | 2 +- test-data/recipes/env_vars/variants.yaml | 2 +- test/end-to-end/test_simple.py | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/test-data/recipes/env_vars/recipe.yaml b/test-data/recipes/env_vars/recipe.yaml index d47ccf4a..6627743c 100644 --- a/test-data/recipes/env_vars/recipe.yaml +++ b/test-data/recipes/env_vars/recipe.yaml @@ -17,4 +17,4 @@ build: requirements: build: # use to make the variant "used" - - pybind11-abi \ No newline at end of file + - pybind11-abi diff --git a/test-data/recipes/env_vars/variants.yaml b/test-data/recipes/env_vars/variants.yaml index 9a3104ba..2562a6c0 100644 --- a/test-data/recipes/env_vars/variants.yaml +++ b/test-data/recipes/env_vars/variants.yaml @@ -1,4 +1,4 @@ MAKEFLAGS: - OVERRIDDEN_MAKEFLAGS pybind11_abi: - - 4 \ No newline at end of file + - 4 diff --git a/test/end-to-end/test_simple.py b/test/end-to-end/test_simple.py index 21b99b65..018dd83f 100644 --- a/test/end-to-end/test_simple.py +++ b/test/end-to-end/test_simple.py @@ -991,5 +991,10 @@ def test_env_vars_override(rattler_build: RattlerBuild, recipes: Path, tmp_path: assert variant_config["pybind11_abi"] == "4" # Check that we used the variant in the rendered recipe - rendered_recipe = yaml.safe_load((pkg / "info/recipe/rendered_recipe.yaml").read_text()) - assert(rendered_recipe["finalized_dependencies"]["build"]["specs"][0] == {"variant": "pybind11-abi", "spec": "pybind11-abi 4.*"}) \ No newline at end of file + rendered_recipe = yaml.safe_load( + (pkg / "info/recipe/rendered_recipe.yaml").read_text() + ) + assert rendered_recipe["finalized_dependencies"]["build"]["specs"][0] == { + "variant": "pybind11-abi", + "spec": "pybind11-abi 4.*", + }