Skip to content

Commit 259c3dc

Browse files
SilvanocSilvanoc
committed
refactor: move modules from utils to types
Move modules defining types rather than utilities from `linkml_runtime.utils` to `linkml_runtime.types`. Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
1 parent faac277 commit 259c3dc

40 files changed

+460
-106
lines changed

‎linkml_runtime/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from pathlib import Path
2-
from linkml_runtime.utils.curienamespace import CurieNamespace
2+
from linkml_runtime.types.curienamespace import CurieNamespace
33
from linkml_runtime.utils.schemaview import SchemaView
44
from rdflib import RDF, RDFS, SKOS, XSD, OWL
55

‎linkml_runtime/linkml_model/annotations.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
from typing import Optional, Union, ClassVar, Any
1010
from dataclasses import dataclass
1111

12-
from linkml_runtime.utils.slot import Slot
13-
from linkml_runtime.utils.metamodelcore import empty_dict
12+
from linkml_runtime.types.slot import Slot
13+
from linkml_runtime.types.metamodelcore import empty_dict
1414
from linkml_runtime.utils.yamlutils import YAMLRoot
1515
from rdflib import URIRef
16-
from linkml_runtime.utils.curienamespace import CurieNamespace
16+
from linkml_runtime.types.curienamespace import CurieNamespace
1717
from .extensions import AnyValue, Extension, ExtensionTag
1818

1919
metamodel_version = "1.7.0"

‎linkml_runtime/linkml_model/datasets.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
from typing import Optional, Union, ClassVar, Any
1010
from dataclasses import dataclass
1111

12-
from linkml_runtime.utils.slot import Slot
13-
from linkml_runtime.utils.metamodelcore import empty_list
12+
from linkml_runtime.types.slot import Slot
13+
from linkml_runtime.types.metamodelcore import empty_list
1414
from linkml_runtime.utils.yamlutils import YAMLRoot, extended_str
15-
from linkml_runtime.utils.enumerations import EnumDefinitionImpl
15+
from linkml_runtime.types.enum import EnumDefinitionImpl
1616
from rdflib import URIRef
17-
from linkml_runtime.utils.curienamespace import CurieNamespace
18-
from linkml_runtime.utils.metamodelcore import URI, URIorCURIE, XSDDateTime
17+
from linkml_runtime.types.curienamespace import CurieNamespace
18+
from linkml_runtime.types.metamodelcore import URI, URIorCURIE, XSDDateTime
1919

2020
metamodel_version = "1.7.0"
2121
version = None

‎linkml_runtime/linkml_model/extensions.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
from typing import Optional, Union, ClassVar, Any
1010
from dataclasses import dataclass
1111

12-
from linkml_runtime.utils.slot import Slot
13-
from linkml_runtime.utils.metamodelcore import empty_dict
12+
from linkml_runtime.types.slot import Slot
13+
from linkml_runtime.types.metamodelcore import empty_dict
1414
from linkml_runtime.utils.yamlutils import YAMLRoot
1515
from rdflib import URIRef
16-
from linkml_runtime.utils.curienamespace import CurieNamespace
17-
from linkml_runtime.utils.metamodelcore import URIorCURIE
16+
from linkml_runtime.types.curienamespace import CurieNamespace
17+
from linkml_runtime.types.metamodelcore import URIorCURIE
1818

1919
metamodel_version = "1.7.0"
2020
version = "2.0.0"

‎linkml_runtime/linkml_model/mappings.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
from typing import Optional, Union
1010

11-
from linkml_runtime.utils.slot import Slot
12-
from linkml_runtime.utils.curienamespace import CurieNamespace
13-
from linkml_runtime.utils.metamodelcore import URIorCURIE
11+
from linkml_runtime.types.slot import Slot
12+
from linkml_runtime.types.curienamespace import CurieNamespace
13+
from linkml_runtime.types.metamodelcore import URIorCURIE
1414

1515
metamodel_version = "1.7.0"
1616
version = "2.0.0"

‎linkml_runtime/linkml_model/meta.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
from typing import Optional, Union, ClassVar, Any
3535
from dataclasses import dataclass
3636

37-
from linkml_runtime.utils.slot import Slot
38-
from linkml_runtime.utils.metamodelcore import empty_list, empty_dict
37+
from linkml_runtime.types.slot import Slot
38+
from linkml_runtime.types.metamodelcore import empty_list, empty_dict
3939
from linkml_runtime.utils.yamlutils import YAMLRoot, extended_str
4040
from linkml_runtime.utils.formatutils import sfx
41-
from linkml_runtime.utils.enumerations import EnumDefinitionImpl
41+
from linkml_runtime.types.enum import EnumDefinitionImpl
4242
from rdflib import URIRef
43-
from linkml_runtime.utils.curienamespace import CurieNamespace
43+
from linkml_runtime.types.curienamespace import CurieNamespace
4444
from .annotations import Annotation, AnnotationTag
4545
from .extensions import Extension, ExtensionTag
4646
from .units import UnitOfMeasure
47-
from linkml_runtime.utils.metamodelcore import Bool, NCName, URI, URIorCURIE, XSDDateTime
47+
from linkml_runtime.types.metamodelcore import Bool, NCName, URI, URIorCURIE, XSDDateTime
4848

4949
metamodel_version = "1.7.0"
5050
version = None

‎linkml_runtime/linkml_model/types.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# license: https://creativecommons.org/publicdomain/zero/1.0/
88

99

10-
from linkml_runtime.utils.curienamespace import CurieNamespace
11-
from linkml_runtime.utils.metamodelcore import Bool, Curie, Decimal, ElementIdentifier, NCName, NodeIdentifier, URI, URIorCURIE, XSDDate, XSDDateTime, XSDTime
10+
from linkml_runtime.types.curienamespace import CurieNamespace
11+
from linkml_runtime.types.metamodelcore import Bool, Curie, Decimal, ElementIdentifier, NCName, NodeIdentifier, URI, URIorCURIE, XSDDate, XSDDateTime, XSDTime
1212

1313
metamodel_version = "1.7.0"
1414
version = None

‎linkml_runtime/linkml_model/units.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
from typing import Optional, Union, ClassVar, Any
1010
from dataclasses import dataclass
1111

12-
from linkml_runtime.utils.slot import Slot
13-
from linkml_runtime.utils.metamodelcore import empty_list
12+
from linkml_runtime.types.slot import Slot
13+
from linkml_runtime.types.metamodelcore import empty_list
1414
from linkml_runtime.utils.yamlutils import YAMLRoot
1515
from rdflib import URIRef
16-
from linkml_runtime.utils.curienamespace import CurieNamespace
17-
from linkml_runtime.utils.metamodelcore import URIorCURIE
16+
from linkml_runtime.types.curienamespace import CurieNamespace
17+
from linkml_runtime.types.metamodelcore import URIorCURIE
1818

1919
metamodel_version = "1.7.0"
2020
version = None

‎linkml_runtime/linkml_model/validation.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
from typing import Optional, Union, ClassVar, Any
1111
from dataclasses import dataclass
1212

13-
from linkml_runtime.utils.slot import Slot
14-
from linkml_runtime.utils.metamodelcore import empty_list
13+
from linkml_runtime.types.slot import Slot
14+
from linkml_runtime.types.metamodelcore import empty_list
1515
from linkml_runtime.utils.yamlutils import YAMLRoot
16-
from linkml_runtime.utils.enumerations import EnumDefinitionImpl
16+
from linkml_runtime.types.enum import EnumDefinitionImpl
1717
from rdflib import URIRef
18-
from linkml_runtime.utils.curienamespace import CurieNamespace
19-
from linkml_runtime.utils.metamodelcore import NodeIdentifier
18+
from linkml_runtime.types.curienamespace import CurieNamespace
19+
from linkml_runtime.types.metamodelcore import NodeIdentifier
2020

2121
metamodel_version = "1.7.0"
2222
version = None

‎linkml_runtime/processing/referencevalidator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
)
4343
from linkml_runtime.utils import yamlutils
4444
from linkml_runtime.utils.eval_utils import eval_expr
45-
from linkml_runtime.utils.metamodelcore import (
45+
from linkml_runtime.types.metamodelcore import (
4646
XSDTime,
4747
Bool,
4848
XSDDate,

0 commit comments

Comments
 (0)