diff --git a/tests/test_issues/output/__pycache__/importee.cpython-38.pyc b/tests/test_issues/output/__pycache__/importee.cpython-38.pyc index 1e291a2c..2ef9a881 100644 Binary files a/tests/test_issues/output/__pycache__/importee.cpython-38.pyc and b/tests/test_issues/output/__pycache__/importee.cpython-38.pyc differ diff --git a/tests/test_issues/output/__pycache__/issues_368_imports.cpython-38.pyc b/tests/test_issues/output/__pycache__/issues_368_imports.cpython-38.pyc new file mode 100644 index 00000000..a9a355fd Binary files /dev/null and b/tests/test_issues/output/__pycache__/issues_368_imports.cpython-38.pyc differ diff --git a/tests/test_issues/output/issue_167b.py b/tests/test_issues/output/issue_167b.py index af70cdcf..32b0bf8f 100644 --- a/tests/test_issues/output/issue_167b.py +++ b/tests/test_issues/output/issue_167b.py @@ -1,5 +1,5 @@ # Auto generated from issue_167b.yaml by pythongen.py version: 0.9.0 -# Generation date: 2021-02-02 18:10 +# Generation date: 2021-02-16 19:05 # Schema: annotations_test # # id: http://example.org/tests/issue167b diff --git a/tests/test_issues/output/issue_260/__pycache__/__init__.cpython-38.pyc b/tests/test_issues/output/issue_260/__pycache__/__init__.cpython-38.pyc index 18beaad6..be49338f 100644 Binary files a/tests/test_issues/output/issue_260/__pycache__/__init__.cpython-38.pyc and b/tests/test_issues/output/issue_260/__pycache__/__init__.cpython-38.pyc differ diff --git a/tests/test_issues/output/issue_260/__pycache__/issue_260a.cpython-38.pyc b/tests/test_issues/output/issue_260/__pycache__/issue_260a.cpython-38.pyc index 8f353be4..dab15b57 100644 Binary files a/tests/test_issues/output/issue_260/__pycache__/issue_260a.cpython-38.pyc and b/tests/test_issues/output/issue_260/__pycache__/issue_260a.cpython-38.pyc differ diff --git a/tests/test_issues/output/issue_260/__pycache__/issue_260b.cpython-38.pyc b/tests/test_issues/output/issue_260/__pycache__/issue_260b.cpython-38.pyc index 8d3adea8..48f89f41 100644 Binary files a/tests/test_issues/output/issue_260/__pycache__/issue_260b.cpython-38.pyc and b/tests/test_issues/output/issue_260/__pycache__/issue_260b.cpython-38.pyc differ diff --git a/tests/test_issues/output/issue_260/__pycache__/issue_260c.cpython-38.pyc b/tests/test_issues/output/issue_260/__pycache__/issue_260c.cpython-38.pyc index 7877338f..9cfa84e0 100644 Binary files a/tests/test_issues/output/issue_260/__pycache__/issue_260c.cpython-38.pyc and b/tests/test_issues/output/issue_260/__pycache__/issue_260c.cpython-38.pyc differ diff --git a/tests/test_issues/output/issue_344_context.json b/tests/test_issues/output/issue_344_context.json index 3b1ed4ca..21ab58d7 100644 --- a/tests/test_issues/output/issue_344_context.json +++ b/tests/test_issues/output/issue_344_context.json @@ -1,5 +1,5 @@ { - "_comments": "Auto generated from issue_344.yaml by jsonldcontextgen.py version: 0.1.1\nGeneration date: 2021-02-02 18:10\nSchema: annotations_test\n\nid: http://example.org/tests/issue344\ndescription: \nlicense: \n", + "_comments": "Auto generated from issue_344.yaml by jsonldcontextgen.py version: 0.1.1\nGeneration date: 2021-02-16 19:05\nSchema: annotations_test\n\nid: http://example.org/tests/issue344\ndescription: \nlicense: \n", "@context": { "type": "@type", "GO": "http://purl.obolibrary.org/obo/GO_", diff --git a/tests/test_issues/output/issue_368.py b/tests/test_issues/output/issue_368.py new file mode 100644 index 00000000..6967bf20 --- /dev/null +++ b/tests/test_issues/output/issue_368.py @@ -0,0 +1,71 @@ +# Auto generated from issue_368.yaml by pythongen.py version: 0.9.0 +# Generation date: 2021-02-16 19:05 +# Schema: schema +# +# id: https://microbiomedata/schema +# description: +# license: https://creativecommons.org/publicdomain/zero/1.0/ + +import dataclasses +import sys +import re +from typing import Optional, List, Union, Dict, ClassVar, Any +from dataclasses import dataclass +from biolinkml.meta import EnumDefinition, PermissibleValue, PvFormulaOptions + +from biolinkml.utils.slot import Slot +from biolinkml.utils.metamodelcore import empty_list, empty_dict, bnode +from biolinkml.utils.yamlutils import YAMLRoot, extended_str, extended_float, extended_int +if sys.version_info < (3, 7, 6): + from biolinkml.utils.dataclass_extensions_375 import dataclasses_init_fn_with_kwargs +else: + from biolinkml.utils.dataclass_extensions_376 import dataclasses_init_fn_with_kwargs +from biolinkml.utils.formatutils import camelcase, underscore, sfx +from biolinkml.utils.enumerations import EnumDefinitionImpl +from rdflib import Namespace, URIRef +from biolinkml.utils.curienamespace import CurieNamespace +from . issues_368_imports import E, ParentClass + +metamodel_version = "1.7.0" + +# Overwrite dataclasses _init_fn to add **kwargs in __init__ +dataclasses._init_fn = dataclasses_init_fn_with_kwargs + +# Namespaces +BIOLINKML = CurieNamespace('biolinkml', 'https://w3id.org/biolink/biolinkml/') +DEFAULT_ = CurieNamespace('', 'https://microbiomedata/schema/') + + +# Types + +# Class references + + + +@dataclass +class C(ParentClass): + _inherited_slots: ClassVar[List[str]] = [] + + class_class_uri: ClassVar[URIRef] = URIRef("https://microbiomedata/schema/C") + class_class_curie: ClassVar[str] = None + class_name: ClassVar[str] = "c" + class_model_uri: ClassVar[URIRef] = URIRef("https://microbiomedata/schema/C") + + s: Optional[Union[str, "E"]] = None + + def __post_init__(self, *_: List[str], **kwargs: Dict[str, Any]): + if self.s is not None and not isinstance(self.s, E): + self.s = E(self.s) + + super().__post_init__(**kwargs) + + +# Enumerations + + +# Slots +class slots: + pass + +slots.s = Slot(uri=DEFAULT_.s, name="s", curie=DEFAULT_.curie('s'), + model_uri=DEFAULT_.s, domain=None, range=Optional[Union[str, "E"]]) \ No newline at end of file diff --git a/tests/test_issues/output/issues_368_imports.py b/tests/test_issues/output/issues_368_imports.py new file mode 100644 index 00000000..c231ef87 --- /dev/null +++ b/tests/test_issues/output/issues_368_imports.py @@ -0,0 +1,68 @@ +# Auto generated from issues_368_imports.yaml by pythongen.py version: 0.9.0 +# Generation date: 2021-02-16 19:05 +# Schema: mixs +# +# id: https://microbiomedata/schema/mixs +# description: +# license: + +import dataclasses +import sys +import re +from typing import Optional, List, Union, Dict, ClassVar, Any +from dataclasses import dataclass +from biolinkml.meta import EnumDefinition, PermissibleValue, PvFormulaOptions + +from biolinkml.utils.slot import Slot +from biolinkml.utils.metamodelcore import empty_list, empty_dict, bnode +from biolinkml.utils.yamlutils import YAMLRoot, extended_str, extended_float, extended_int +if sys.version_info < (3, 7, 6): + from biolinkml.utils.dataclass_extensions_375 import dataclasses_init_fn_with_kwargs +else: + from biolinkml.utils.dataclass_extensions_376 import dataclasses_init_fn_with_kwargs +from biolinkml.utils.formatutils import camelcase, underscore, sfx +from biolinkml.utils.enumerations import EnumDefinitionImpl +from rdflib import Namespace, URIRef +from biolinkml.utils.curienamespace import CurieNamespace + + +metamodel_version = "1.7.0" + +# Overwrite dataclasses _init_fn to add **kwargs in __init__ +dataclasses._init_fn = dataclasses_init_fn_with_kwargs + +# Namespaces +DEFAULT_ = CurieNamespace('', 'https://microbiomedata/schema/mixs/') + + +# Types + +# Class references + + + +class ParentClass(YAMLRoot): + _inherited_slots: ClassVar[List[str]] = [] + + class_class_uri: ClassVar[URIRef] = URIRef("https://microbiomedata/schema/mixs/ParentClass") + class_class_curie: ClassVar[str] = None + class_name: ClassVar[str] = "parent_class" + class_model_uri: ClassVar[URIRef] = URIRef("https://microbiomedata/schema/mixs/ParentClass") + + +# Enumerations +class E(EnumDefinitionImpl): + + a = PermissibleValue(text="a", + description="A") + b = PermissibleValue(text="b", + description="B") + + _defn = EnumDefinition( + name="E", + ) + +# Slots +class slots: + pass +