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.

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

Rename ConfigDict class to avoid name clash with pydantic #9

Merged
merged 1 commit into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions src/bugjira/config.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import json

import pydantic
from pydantic import BaseModel, field_validator, constr
from pydantic import ConfigDict, BaseModel, field_validator, constr


class BugzillaConfig(BaseModel):
model_config = pydantic.ConfigDict(extra='forbid')
model_config = ConfigDict(extra='forbid')

URL: constr(strip_whitespace=True, min_length=1)
api_key: constr(strip_whitespace=True, min_length=1)


class JiraConfig(BaseModel):
model_config = pydantic.ConfigDict(extra='forbid')
model_config = ConfigDict(extra='forbid')

URL: constr(strip_whitespace=True, min_length=1)
token_auth: constr(strip_whitespace=True, min_length=1)


class ConfigDict(BaseModel):
model_config = pydantic.ConfigDict(extra='forbid')
class BugjiraConfigDict(BaseModel):
model_config = ConfigDict(extra='forbid')

bugzilla: BugzillaConfig
jira: JiraConfig
Expand All @@ -32,7 +31,7 @@ class Config(BaseModel):

@field_validator("config_dict")
def validate_minimum_config(cls, v):
ConfigDict(**v)
BugjiraConfigDict(**v)
return v

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_broker.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest
from bugzilla import Bugzilla
from jira import JIRA
from pydantic.error_wrappers import ValidationError
from pydantic import ValidationError

import bugjira.broker as broker
from bugjira.broker import (
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from copy import deepcopy

import pytest
from pydantic.error_wrappers import ValidationError
from pydantic import ValidationError

from bugjira.config import Config

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_issue.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from pydantic.error_wrappers import ValidationError
from pydantic import ValidationError

from bugjira.issue import BugzillaIssue, JiraIssue

Expand Down