Skip to content

Commit

Permalink
try to fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfv committed Aug 7, 2024
1 parent b8b7359 commit 3a33fbd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion conda_forge_tick/update_recipe/v2/jinja/filters.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 5 additions & 5 deletions conda_forge_tick/update_recipe/v2/jinja/jinja.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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):
Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_recipe_editing_v2.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 3a33fbd

Please sign in to comment.