Skip to content

Commit 74cec4f

Browse files
apply ruff safe fixes
1 parent d7d8975 commit 74cec4f

File tree

93 files changed

+336
-346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+336
-346
lines changed

linkml_runtime/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
from pathlib import Path
2+
3+
from rdflib import OWL, RDF, RDFS, SKOS, XSD
4+
25
from linkml_runtime.utils.curienamespace import CurieNamespace
36
from linkml_runtime.utils.schemaview import SchemaView
4-
from rdflib import RDF, RDFS, SKOS, XSD, OWL
57

68
__all__ = [
79
"SchemaView",

linkml_runtime/dumpers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
from linkml_runtime.dumpers.csv_dumper import CSVDumper
12
from linkml_runtime.dumpers.json_dumper import JSONDumper
23
from linkml_runtime.dumpers.rdf_dumper import RDFDumper
34
from linkml_runtime.dumpers.rdflib_dumper import RDFLibDumper
45
from linkml_runtime.dumpers.tsv_dumper import TSVDumper
56
from linkml_runtime.dumpers.yaml_dumper import YAMLDumper
6-
from linkml_runtime.dumpers.csv_dumper import CSVDumper
77

88
json_dumper = JSONDumper()
99
rdf_dumper = RDFDumper()

linkml_runtime/dumpers/dumper_root.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from abc import ABC, abstractmethod
22
from typing import Union
33

4-
from linkml_runtime.utils.yamlutils import YAMLRoot
54
from pydantic import BaseModel
65

6+
from linkml_runtime.utils.yamlutils import YAMLRoot
7+
78

89
class Dumper(ABC):
910
"""Abstract base class for all dumpers"""

linkml_runtime/dumpers/json_dumper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
from datetime import datetime, date
33
from decimal import Decimal
44
from typing import Union
5-
from pydantic import BaseModel
65

76
from deprecated.classic import deprecated
7+
from jsonasobj2 import JsonObj
8+
from pydantic import BaseModel
89

910
from linkml_runtime.dumpers.dumper_root import Dumper
1011
from linkml_runtime.utils import formatutils
1112
from linkml_runtime.utils.context_utils import CONTEXTS_PARAM_TYPE
1213
from linkml_runtime.utils.formatutils import remove_empty_items
1314
from linkml_runtime.utils.yamlutils import YAMLRoot, as_json_object
14-
from jsonasobj2 import JsonObj
1515

1616

1717
class JSONDumper(Dumper):

linkml_runtime/dumpers/rdf_dumper.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import json
22
from typing import Optional, Union
3-
from pydantic import BaseModel
43

54
from hbreader import hbread
5+
from pydantic import BaseModel
66
from rdflib import Graph
77

8-
98
from linkml_runtime.dumpers.dumper_root import Dumper
10-
from linkml_runtime.utils.context_utils import CONTEXTS_PARAM_TYPE, CONTEXT_TYPE
9+
from linkml_runtime.utils.context_utils import CONTEXT_TYPE, CONTEXTS_PARAM_TYPE
1110
from linkml_runtime.utils.formatutils import remove_empty_items
1211
from linkml_runtime.utils.yamlutils import YAMLRoot
1312

@@ -31,7 +30,7 @@ def as_rdf_graph(
3130
:return: rdflib Graph containing element
3231
"""
3332
if contexts is None:
34-
raise Exception(f"Must pass in JSON-LD context via contexts parameter")
33+
raise Exception("Must pass in JSON-LD context via contexts parameter")
3534
if isinstance(contexts, list):
3635
inp_contexts = [json.loads(hbread(c)) for c in contexts]
3736
else:

linkml_runtime/dumpers/rdflib_dumper.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import logging
22
import urllib
3-
from typing import Optional, Any, Union
4-
from pydantic import BaseModel
3+
from typing import Any, Optional, Union
54

65
from curies import Converter
7-
from rdflib import Graph, URIRef, XSD
8-
from rdflib.term import Node, BNode, Literal
6+
from pydantic import BaseModel
7+
from rdflib import XSD, Graph, URIRef
98
from rdflib.namespace import RDF
10-
9+
from rdflib.term import BNode, Literal, Node
1110

1211
from linkml_runtime.dumpers.dumper_root import Dumper
1312
from linkml_runtime.linkml_model import SlotDefinition
14-
from linkml_runtime.utils.schemaview import SchemaView, ElementName, PermissibleValue, PermissibleValueText
13+
from linkml_runtime.utils.schemaview import ElementName, PermissibleValue, PermissibleValueText, SchemaView
1514
from linkml_runtime.utils.yamlutils import YAMLRoot
1615

1716
logger = logging.getLogger(__name__)

linkml_runtime/dumpers/yaml_dumper.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import yaml
21
from typing import Union
2+
3+
import yaml
34
from pydantic import BaseModel
45

56
from linkml_runtime.dumpers.dumper_root import Dumper

linkml_runtime/index/object_index.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
a proxy for a domain object that "knows" its place in the index
1010
"""
1111

12-
import logging
1312
import inspect
13+
import logging
14+
from collections.abc import Iterator, Mapping
1415
from typing import Any, Union
15-
from collections.abc import Mapping, Iterator
1616

1717
from linkml_runtime import SchemaView
1818
from linkml_runtime.utils import eval_utils

linkml_runtime/linkml_model/__init__.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
from .types import (
2-
String,
3-
Integer,
4-
Boolean,
5-
Float,
6-
Double,
7-
Decimal,
8-
Time,
9-
Date,
10-
Datetime,
11-
Uriorcurie,
12-
Uri,
13-
Ncname,
14-
Objectidentifier,
15-
Nodeidentifier,
16-
)
17-
from .extensions import Extension, Extensible
18-
from .annotations import Annotation, Annotatable
1+
from .annotations import Annotatable, Annotation
2+
from .extensions import Extensible, Extension
193
from .meta import (
20-
ElementName,
21-
SchemaDefinitionName,
22-
TypeDefinitionName,
23-
SubsetDefinitionName,
24-
DefinitionName,
25-
EnumDefinitionName,
26-
SlotDefinitionName,
27-
ClassDefinitionName,
28-
PrefixPrefixPrefix,
29-
LocalNameLocalNameSource,
4+
AltDescription,
305
AltDescriptionSource,
31-
PermissibleValueText,
32-
Element,
33-
SchemaDefinition,
34-
TypeDefinition,
35-
SubsetDefinition,
6+
ClassDefinition,
7+
ClassDefinitionName,
368
Definition,
9+
DefinitionName,
10+
Element,
11+
ElementName,
3712
EnumDefinition,
38-
SlotDefinition,
39-
ClassDefinition,
40-
Prefix,
41-
LocalName,
13+
EnumDefinitionName,
4214
Example,
43-
AltDescription,
15+
LocalName,
16+
LocalNameLocalNameSource,
4417
PermissibleValue,
18+
PermissibleValueText,
19+
Prefix,
20+
PrefixPrefixPrefix,
4521
PvFormulaOptions,
22+
SchemaDefinition,
23+
SchemaDefinitionName,
24+
SlotDefinition,
25+
SlotDefinitionName,
26+
SubsetDefinition,
27+
SubsetDefinitionName,
28+
TypeDefinition,
29+
TypeDefinitionName,
30+
)
31+
from .types import (
32+
Boolean,
33+
Date,
34+
Datetime,
35+
Decimal,
36+
Double,
37+
Float,
38+
Integer,
39+
Ncname,
40+
Nodeidentifier,
41+
Objectidentifier,
42+
String,
43+
Time,
44+
Uri,
45+
Uriorcurie,
4646
)
4747

4848
__all__ = [

linkml_runtime/linkml_model/annotations.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
# description: Annotations mixin
77
# license: https://creativecommons.org/publicdomain/zero/1.0/
88

9-
import dataclasses
10-
from typing import Optional, Union, ClassVar, Any
119
from dataclasses import dataclass
10+
from typing import Any, ClassVar, Optional, Union
1211

13-
from linkml_runtime.utils.slot import Slot
14-
from linkml_runtime.utils.metamodelcore import empty_dict
15-
from linkml_runtime.utils.yamlutils import YAMLRoot
1612
from rdflib import URIRef
13+
1714
from linkml_runtime.utils.curienamespace import CurieNamespace
15+
from linkml_runtime.utils.metamodelcore import empty_dict
16+
from linkml_runtime.utils.slot import Slot
17+
from linkml_runtime.utils.yamlutils import YAMLRoot
18+
1819
from .extensions import AnyValue, Extension, ExtensionTag
1920

2021
metamodel_version = "1.7.0"

0 commit comments

Comments
 (0)