Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make cos_agent charm library compatible with Pydantic v1/v2 #156

Merged
merged 2 commits into from
Aug 8, 2024
Merged

Make cos_agent charm library compatible with Pydantic v1/v2 #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6816a1
Make cos_agent lib compatible with Pydantic v1/v2
weiiwang01 Jul 25, 2024
164b5d5
Merge branch 'main' into cos-agent-pydantic
weiiwang01 Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/charms/grafana_agent/v0/cos_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,18 @@ def __init__(self, *args):
from pathlib import Path
from typing import TYPE_CHECKING, Any, Callable, ClassVar, Dict, List, Optional, Set, Tuple, Union

import pydantic
from cosl import GrafanaDashboard, JujuTopology
from cosl.rules import AlertRules
from ops.charm import RelationChangedEvent
from ops.framework import EventBase, EventSource, Object, ObjectEvents
from ops.model import Relation
from ops.testing import CharmType

try:
import pydantic.v1 as pydantic
except ImportError:
import pydantic

if TYPE_CHECKING:
try:
from typing import TypedDict
Expand All @@ -234,9 +238,9 @@ class _MetricsEndpointDict(TypedDict):

LIBID = "dc15fa84cef84ce58155fb84f6c6213a"
LIBAPI = 0
LIBPATCH = 8
LIBPATCH = 9

PYDEPS = ["cosl", "pydantic < 2"]
PYDEPS = ["cosl", "pydantic"]

DEFAULT_RELATION_NAME = "cos-agent"
DEFAULT_PEER_RELATION_NAME = "peers"
Expand Down
Loading