From 1b9b5f128a7fe08ffbf84cbc7de2986f95dc01f5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 19:07:50 +0100 Subject: [PATCH] chore(deps): update pre-commit hook astral-sh/ruff-pre-commit to v0.11.0 (#212) * chore(deps): update pre-commit hook astral-sh/ruff-pre-commit to v0.11.0 * fix lints Signed-off-by: gruebel --------- Signed-off-by: gruebel Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: gruebel --- .pre-commit-config.yaml | 2 +- .../contrib/provider/flagd/resolvers/process/flags.py | 6 ++---- .../tests/e2e/step/event_steps.py | 6 ++++-- .../tests/e2e/step/provider_steps.py | 4 +++- .../openfeature-provider-flagd/tests/e2e/testfilter.py | 4 +++- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 017c421..a7b3602 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ default_stages: [pre-commit] repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.10 + rev: v0.11.0 hooks: - id: ruff args: [--fix] diff --git a/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/flags.py b/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/flags.py index d8f93b3..638535b 100644 --- a/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/flags.py +++ b/providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/flags.py @@ -72,10 +72,8 @@ class Flag: data["default_variant"] = data["defaultVariant"] del data["defaultVariant"] - if "source" in data: - del data["source"] - if "selector" in data: - del data["selector"] + data.pop("source", None) + data.pop("selector", None) try: flag = cls(key=key, **data) return flag diff --git a/providers/openfeature-provider-flagd/tests/e2e/step/event_steps.py b/providers/openfeature-provider-flagd/tests/e2e/step/event_steps.py index 571fa94..ccd0e9c 100644 --- a/providers/openfeature-provider-flagd/tests/e2e/step/event_steps.py +++ b/providers/openfeature-provider-flagd/tests/e2e/step/event_steps.py @@ -8,6 +8,8 @@ from pytest_bdd import given, parsers, then, when from openfeature.client import OpenFeatureClient from openfeature.event import ProviderEvent +logger = logging.getLogger("openfeature.contrib.tests") + events = { "ready": ProviderEvent.PROVIDER_READY, "error": ProviderEvent.PROVIDER_ERROR, @@ -28,7 +30,7 @@ def event_handles() -> list: ) def add_event_handler(client: OpenFeatureClient, event_type: str, event_handles: list): def handler(event): - logging.warning((event_type, event)) + logger.warning((event_type, event)) event_handles.append( { "type": event_type, @@ -38,7 +40,7 @@ def add_event_handler(client: OpenFeatureClient, event_type: str, event_handles: client.add_handler(events[event_type], handler) - logging.warning(("handler added", event_type)) + logger.warning(("handler added", event_type)) def assert_handlers(handles, event_type: str, max_wait: int = 2): diff --git a/providers/openfeature-provider-flagd/tests/e2e/step/provider_steps.py b/providers/openfeature-provider-flagd/tests/e2e/step/provider_steps.py index 76d739d..4286bc1 100644 --- a/providers/openfeature-provider-flagd/tests/e2e/step/provider_steps.py +++ b/providers/openfeature-provider-flagd/tests/e2e/step/provider_steps.py @@ -22,6 +22,8 @@ KEY_FLAGS = "flags" MERGED_FILE = "merged_file" +logger = logging.getLogger("openfeature.contrib.tests") + class TestProviderType(Enum): UNAVAILABLE = "unavailable" @@ -133,7 +135,7 @@ def container(request): try: container.stop() except: # noqa: E722 - we want to ensure all containers are stopped, even if we do have an exception here - logging.debug("container was not running anymore") + logger.debug("container was not running anymore") # Teardown code request.addfinalizer(fin) diff --git a/providers/openfeature-provider-flagd/tests/e2e/testfilter.py b/providers/openfeature-provider-flagd/tests/e2e/testfilter.py index 8937e15..4fd802c 100644 --- a/providers/openfeature-provider-flagd/tests/e2e/testfilter.py +++ b/providers/openfeature-provider-flagd/tests/e2e/testfilter.py @@ -1,6 +1,8 @@ import logging import os +logger = logging.getLogger("openfeature.contrib.tests") + class TestFilter: def __init__(self, config, feature_list=None, resolver=None, base_path=None): @@ -40,7 +42,7 @@ class TestFilter: all_tags = self._get_item_tags(item) # Debug: Print collected tags for each item - logging.debug(f"Item: {item.nodeid}, Tags: {all_tags}") + logger.debug(f"Item: {item.nodeid}, Tags: {all_tags}") # Include-only logic: Skip items that do not match include_tags if (