Skip to content

Commit 02a21b2

Browse files
committed
style: configure src for ruff to ensure correct isort
1 parent 28f5434 commit 02a21b2

File tree

9 files changed

+28
-22
lines changed

9 files changed

+28
-22
lines changed

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ requires = ["setuptools>=65.3", "setuptools_scm>=8"]
6262
build-backend = "setuptools.build_meta"
6363

6464
[tool.ruff]
65+
src = ["src"]
6566
exclude = [
6667
"submodules"
6768
]

src/ga4gh/va_spec/aac_2017/models.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
from enum import Enum
88

9+
from pydantic import (
10+
Field,
11+
field_validator,
12+
)
13+
914
from ga4gh.core.models import MappableConcept, iriReference
1015
from ga4gh.va_spec.base.core import (
1116
Method,
@@ -16,10 +21,6 @@
1621
)
1722
from ga4gh.va_spec.base.enums import System
1823
from ga4gh.va_spec.base.validators import validate_mappable_concept
19-
from pydantic import (
20-
Field,
21-
field_validator,
22-
)
2324

2425

2526
class Strength(str, Enum):

src/ga4gh/va_spec/acmg_2015/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
from enum import Enum
77

8+
from pydantic import Field, field_validator, model_validator
9+
810
from ga4gh.core.models import MappableConcept, iriReference
911
from ga4gh.va_spec.base.core import (
1012
EvidenceLine,
@@ -21,7 +23,6 @@
2123
from ga4gh.va_spec.base.validators import (
2224
validate_mappable_concept,
2325
)
24-
from pydantic import Field, field_validator, model_validator
2526

2627

2728
class AcmgClassification(str, Enum):

src/ga4gh/va_spec/base/core.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
from enum import Enum
1010
from typing import Annotated, Literal, TypeVar
1111

12+
from pydantic import (
13+
ConfigDict,
14+
Field,
15+
RootModel,
16+
StringConstraints,
17+
ValidationError,
18+
field_validator,
19+
)
20+
1221
from ga4gh.cat_vrs.models import CategoricalVariant
1322
from ga4gh.core.models import (
1423
BaseModelForbidExtra,
@@ -25,14 +34,6 @@
2534
)
2635
from ga4gh.va_spec.base.validators import validate_mappable_concept
2736
from ga4gh.vrs.models import Allele, MolecularVariation
28-
from pydantic import (
29-
ConfigDict,
30-
Field,
31-
RootModel,
32-
StringConstraints,
33-
ValidationError,
34-
field_validator,
35-
)
3637

3738
StatementType = TypeVar("StatementType")
3839
EvidenceLineType = TypeVar("EvidenceLineType")

src/ga4gh/va_spec/base/domain_entities.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
from __future__ import annotations
44

5+
from pydantic import ConfigDict, Field, RootModel
6+
57
from ga4gh.core.models import BaseModelForbidExtra, Element, MappableConcept
68
from ga4gh.va_spec.base.enums import MembershipOperator
7-
from pydantic import ConfigDict, Field, RootModel
89

910

1011
class ConditionSet(Element, BaseModelForbidExtra):

src/ga4gh/va_spec/ccv_2022/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
from enum import Enum
77

8+
from pydantic import Field, field_validator, model_validator
9+
810
from ga4gh.core.models import MappableConcept, iriReference
911
from ga4gh.va_spec.base.core import (
1012
EvidenceLine,
@@ -19,7 +21,6 @@
1921
System,
2022
)
2123
from ga4gh.va_spec.base.validators import validate_mappable_concept
22-
from pydantic import Field, field_validator, model_validator
2324

2425

2526
class VariantOncogenicityEvidenceLine(EvidenceLine):

tests/validation/test_va_spec_fixtures_validation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"""Ensure that VA-Spec test fixtures validate against Pydantic models"""
22

33
import yaml
4-
from ga4gh.va_spec import aac_2017, acmg_2015, base, ccv_2022
5-
64
from tests.conftest import SUBMODULES_DIR, VaSpecSchema, get_va_spec_schema
75

6+
from ga4gh.va_spec import aac_2017, acmg_2015, base, ccv_2022
7+
88
VA_SPEC_TESTS_DIR = SUBMODULES_DIR / "tests"
99

1010

tests/validation/test_va_spec_models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
import pytest
77
import yaml
8+
from pydantic import ValidationError
9+
from tests.conftest import SUBMODULES_DIR
10+
811
from ga4gh.core.models import Coding, MappableConcept, code, iriReference
912
from ga4gh.va_spec import acmg_2015, base, ccv_2022
1013
from ga4gh.va_spec.aac_2017.models import VariantTherapeuticResponseStudyStatement
@@ -23,9 +26,6 @@
2326
VariantOncogenicityEvidenceLine,
2427
VariantOncogenicityStudyStatement,
2528
)
26-
from pydantic import ValidationError
27-
28-
from tests.conftest import SUBMODULES_DIR
2929

3030
VA_SPEC_TESTS_DIR = SUBMODULES_DIR / "tests"
3131
VA_SPEC_TEST_FIXTURES = VA_SPEC_TESTS_DIR / "fixtures"

tests/validation/test_va_spec_schema.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
from pathlib import Path
55

66
import pytest
7-
from ga4gh.va_spec import aac_2017, acmg_2015, base, ccv_2022
87
from pydantic import BaseModel
9-
108
from tests.conftest import (
119
SUBMODULES_DIR,
1210
VaSpecSchema,
1311
get_va_spec_schema,
1412
)
1513

14+
from ga4gh.va_spec import aac_2017, acmg_2015, base, ccv_2022
15+
1616
VA_SCHEMA_DIR = SUBMODULES_DIR / "schema" / "va-spec"
1717

1818

0 commit comments

Comments
 (0)