From 3a33fbdf3beb6cf3e6b6f74219b575589806bc12 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Wed, 7 Aug 2024 16:49:43 +0200 Subject: [PATCH] try to fix tests --- conda_forge_tick/update_recipe/v2/jinja/filters.py | 2 +- conda_forge_tick/update_recipe/v2/jinja/jinja.py | 10 +++++----- tests/test_recipe_editing_v2.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conda_forge_tick/update_recipe/v2/jinja/filters.py b/conda_forge_tick/update_recipe/v2/jinja/filters.py index b28e4555d6..dcf3af12f3 100644 --- a/conda_forge_tick/update_recipe/v2/jinja/filters.py +++ b/conda_forge_tick/update_recipe/v2/jinja/filters.py @@ -1,6 +1,6 @@ from __future__ import annotations -from rattler_build_conda_compat.jinja.utils import _MissingUndefined +from conda_forge_tick.jinja.utils import _MissingUndefined def _version_to_build_string(some_string: str | _MissingUndefined) -> str: diff --git a/conda_forge_tick/update_recipe/v2/jinja/jinja.py b/conda_forge_tick/update_recipe/v2/jinja/jinja.py index 89229bf7f2..7034acc8a0 100644 --- a/conda_forge_tick/update_recipe/v2/jinja/jinja.py +++ b/conda_forge_tick/update_recipe/v2/jinja/jinja.py @@ -5,8 +5,8 @@ import jinja2 import yaml -from rattler_build_conda_compat.jinja.filters import _bool, _split, _version_to_build_string -from rattler_build_conda_compat.jinja.objects import ( +from conda_forge_tick.jinja.filters import _bool, _split, _version_to_build_string +from conda_forge_tick.jinja.objects import ( _stub_compatible_pin, _stub_is_linux, _stub_is_unix, @@ -15,8 +15,8 @@ _stub_subpackage_pin, _StubEnv, ) -from rattler_build_conda_compat.jinja.utils import _MissingUndefined -from rattler_build_conda_compat.loader import load_yaml +from conda_forge_tick.jinja.utils import _MissingUndefined +from conda_forge_tick.loader import load_yaml class RecipeWithContext(TypedDict, total=False): @@ -97,7 +97,7 @@ def render_recipe_with_context(recipe_content: RecipeWithContext) -> dict[str, A --- ```python >>> from pathlib import Path - >>> from rattler_build_conda_compat.loader import load_yaml + >>> from conda_forge_tick.loader import load_yaml >>> recipe_content = load_yaml((Path().resolve() / "tests" / "data" / "eval_recipe_using_context.yaml").read_text()) >>> evaluated_context = render_recipe_with_context(recipe_content) >>> assert "my_value-${{ not_present_value }}" == evaluated_context["build"]["string"] diff --git a/tests/test_recipe_editing_v2.py b/tests/test_recipe_editing_v2.py index 469d5911d0..11a02ec0dd 100644 --- a/tests/test_recipe_editing_v2.py +++ b/tests/test_recipe_editing_v2.py @@ -1,7 +1,7 @@ import pytest from pathlib import Path -from rattler_build_conda_compat.modify_recipe import update_build_number, update_version +from conda_forge_tick.recipe_editing_v2 import update_build_number, update_version @pytest.fixture