From f3597de59af3198ce27b66002e1d6922a13341a1 Mon Sep 17 00:00:00 2001 From: Pietro Pasotti Date: Fri, 6 Sep 2024 16:27:49 +0200 Subject: [PATCH 1/4] fixed double import in tracing lib --- lib/charms/tempo_k8s/v2/tracing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index 116e0720..e2153183 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -97,7 +97,7 @@ def __init__(self, *args): ) from ops.framework import EventSource, Object from ops.model import ModelError, Relation -from pydantic import BaseModel, ConfigDict, Field +from pydantic import BaseModel, Field # The unique Charmhub library identifier, never change it LIBID = "12977e9aa0b34367903d8afeb8c3d85d" @@ -107,7 +107,7 @@ def __init__(self, *args): # Increment this PATCH version before using `charmcraft publish-lib` or reset # to 0 if you are raising the major API version -LIBPATCH = 8 +LIBPATCH = 9 PYDEPS = ["pydantic"] From 4e52513300d052444ed56ecaed70188be123bb53 Mon Sep 17 00:00:00 2001 From: Pietro Pasotti Date: Fri, 6 Sep 2024 16:30:24 +0200 Subject: [PATCH 2/4] one more --- lib/charms/tempo_k8s/v2/tracing.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index e2153183..20d0e92c 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -334,6 +334,7 @@ class Config: ) else: + from pydantic import ConfigDict class ProtocolType(BaseModel): """Protocol Type.""" From fc015ad910d21a2c50219a4021c9dbfee57d1d71 Mon Sep 17 00:00:00 2001 From: Pietro Pasotti Date: Fri, 6 Sep 2024 16:31:29 +0200 Subject: [PATCH 3/4] ignore double import error --- lib/charms/tempo_k8s/v2/tracing.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index 20d0e92c..615e8173 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -334,12 +334,10 @@ class Config: ) else: - from pydantic import ConfigDict - class ProtocolType(BaseModel): """Protocol Type.""" - model_config = ConfigDict( + model_config = ConfigDict( # type: ignore # Allow serializing enum values. use_enum_values=True ) From 1206f093e70677023411282405276be7640b3192 Mon Sep 17 00:00:00 2001 From: Pietro Pasotti Date: Fri, 6 Sep 2024 16:32:38 +0200 Subject: [PATCH 4/4] fmt --- lib/charms/tempo_k8s/v2/tracing.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index 615e8173..d3a7c943 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -334,6 +334,7 @@ class Config: ) else: + class ProtocolType(BaseModel): """Protocol Type."""