Skip to content

Commit b412e72

Browse files
cmungallcmungall
authored
Merge pull request #148 from linkml/additions-for-1.5
Additions for 1.5
2 parents 4b4e4d1 + 85d8dd1 commit b412e72

32 files changed

+10288
-1646
lines changed

‎Makefile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,20 @@ gen-project: $(PYMODEL)
5151
cp -r $(DEST)/* $(PYMODEL)
5252
rm -r $(PYMODEL)/docs
5353

54-
test:
54+
test: test-schema test-python test-validate-schema
55+
test-schema:
56+
$(RUN) gen-project -d tmp $(SOURCE_SCHEMA_PATH)
57+
58+
test-python:
5559
$(RUN) python -m unittest discover
5660

61+
test-examples:
62+
# $(RUN) linkml-run-examples -s $(SOURCE_SCHEMA_PATH) -e tests/input/examples -d /tmp/
63+
find tests/input/examples | ./utils/run-examples.pl
64+
65+
test-validate-schema:
66+
$(RUN) linkml-normalize -s $(SOURCE_SCHEMA_PATH) $(SOURCE_SCHEMA_PATH) -o /tmp/schema
67+
5768
check-config:
5869
@(grep my-datamodel about.yaml > /dev/null && printf "\n**Project not configured**:\n\n - Remember to edit 'about.yaml'\n\n" || exit 0)
5970

‎linkml_model/graphql/meta.graphql‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,18 @@ type AnonymousTypeExpression implements TypeExpression
174174
allOf: [AnonymousTypeExpression]
175175
}
176176

177+
type Anything
178+
{
179+
}
180+
177181
type ClassDefinition implements ClassExpression
178182
{
179183
name: String!
180184
idPrefixes: [Ncname]
181185
definitionUri: Uriorcurie
182186
localNames: [LocalName]
183187
conformsTo: String
188+
implements: [Uriorcurie]
184189
extensions: [Extension]
185190
annotations: [Annotation]
186191
description: String
@@ -328,6 +333,7 @@ interface Definition
328333
definitionUri: Uriorcurie
329334
localNames: [LocalName]
330335
conformsTo: String
336+
implements: [Uriorcurie]
331337
extensions: [Extension]
332338
annotations: [Annotation]
333339
description: String
@@ -376,6 +382,7 @@ type Element implements Extensible, Annotatable, CommonMetadata
376382
definitionUri: Uriorcurie
377383
localNames: [LocalName]
378384
conformsTo: String
385+
implements: [Uriorcurie]
379386
extensions: [Extension]
380387
annotations: [Annotation]
381388
description: String
@@ -412,6 +419,7 @@ type EnumDefinition implements EnumExpression
412419
definitionUri: Uriorcurie
413420
localNames: [LocalName]
414421
conformsTo: String
422+
implements: [Uriorcurie]
415423
extensions: [Extension]
416424
annotations: [Annotation]
417425
description: String
@@ -484,6 +492,7 @@ type Example
484492
{
485493
value: String
486494
description: String
495+
object: Anything
487496
}
488497

489498
interface Expression
@@ -679,6 +688,7 @@ type SchemaDefinition
679688
definitionUri: Uriorcurie
680689
localNames: [LocalName]
681690
conformsTo: String
691+
implements: [Uriorcurie]
682692
extensions: [Extension]
683693
annotations: [Annotation]
684694
description: String
@@ -745,6 +755,7 @@ type SlotDefinition implements SlotExpression
745755
definitionUri: Uriorcurie
746756
localNames: [LocalName]
747757
conformsTo: String
758+
implements: [Uriorcurie]
748759
extensions: [Extension]
749760
annotations: [Annotation]
750761
description: String
@@ -920,6 +931,7 @@ type SubsetDefinition
920931
definitionUri: Uriorcurie
921932
localNames: [LocalName]
922933
conformsTo: String
934+
implements: [Uriorcurie]
923935
extensions: [Extension]
924936
annotations: [Annotation]
925937
description: String
@@ -956,6 +968,7 @@ type TypeDefinition implements TypeExpression
956968
definitionUri: Uriorcurie
957969
localNames: [LocalName]
958970
conformsTo: String
971+
implements: [Uriorcurie]
959972
extensions: [Extension]
960973
annotations: [Annotation]
961974
description: String

‎linkml_model/json/meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6861,9 +6861,9 @@
68616861
],
68626862
"metamodel_version": "1.7.0",
68636863
"source_file": "meta.yaml",
6864-
"source_file_date": "2022-07-14T00:55:10",
6864+
"source_file_date": "2022-07-13T17:52:28",
68656865
"source_file_size": 71464,
6866-
"generation_date": "2022-07-14T00:56:03",
6866+
"generation_date": "2022-07-13T17:56:42",
68676867
"@type": "SchemaDefinition",
68686868
"@context": [
68696869
"https://w3id.org/linkml/types.context.jsonld",

‎linkml_model/jsonld/meta.context.jsonld‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
2-
"_comments": "Auto generated from meta.yaml by jsonldcontextgen.py version: 0.1.1\n Generation date: 2022-12-16T14:11:17\n Schema: meta\n metamodel version: 1.7.0\n model version: 2.0.0\n \n id: https://w3id.org/linkml/meta\n description: The metamodel for schemas defined using the Linked Data Modeling Language framework.\n\nFor more information on LinkML:\n\n* [linkml.io](https://linkml.io) main website\n* [specification](https://linkml.io/linkml-model/docs/specification/)\n\nLinkML is self-describing. Every LinkML schema consists of elements\nthat instantiate classes in this metamodel.\n\nCore metaclasses:\n\n* [SchemaDefinition](https://w3id.org/linkml/SchemaDefinition)\n* [ClassDefinition](https://w3id.org/linkml/ClassDefinition)\n* [SlotDefinition](https://w3id.org/linkml/SlotDefinition)\n* [TypeDefinition](https://w3id.org/linkml/TypeDefinition)\n\nThere are many subsets of *profiles* of the metamodel, for different purposes:\n\n* [MinimalSubset](https://w3id.org/linkml/MinimalSubset)\n* [BasicSubset](https://w3id.org/linkml/BasicSubset)\n* [BasicSubset](https://w3id.org/linkml/BasicSubset)\n\nFor canonical reference documentation on any metamodel construct,\nrefer to the official URI for each construct, e.g.\n[https://w3id.org/linkml/is_a](https://w3id.org/linkml/is_a)\n license: https://creativecommons.org/publicdomain/zero/1.0/\n ",
2+
"comments": {
3+
"description": "Auto generated by LinkML jsonld context generator",
4+
"generation_date": "2023-02-03T10:05:13",
5+
"source": "meta.yaml"
6+
},
37
"@context": {
48
"IAO": {
59
"@id": "http://purl.obolibrary.org/obo/IAO_",
@@ -19,7 +23,7 @@
1923
"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
2024
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
2125
"schema": "http://schema.org/",
22-
"sh": "https://w3id.org/shacl/",
26+
"sh": "http://www.w3.org/ns/shacl#",
2327
"skos": "http://www.w3.org/2004/02/skos/core#",
2428
"skosxl": "http://www.w3.org/2008/05/skos-xl#",
2529
"swrl": "http://www.w3.org/2003/11/swrl#",
@@ -212,6 +216,9 @@
212216
"iec61360code": {
213217
"@id": "qudt:iec61360Code"
214218
},
219+
"implements": {
220+
"@type": "@id"
221+
},
215222
"import_from": {
216223
"@type": "@id"
217224
},
@@ -249,6 +256,9 @@
249256
"inlined_as_list": {
250257
"@type": "xsd:boolean"
251258
},
259+
"inlined_as_simple_dict": {
260+
"@type": "xsd:boolean"
261+
},
252262
"interpolated": {
253263
"@type": "xsd:boolean"
254264
},
@@ -518,8 +528,7 @@
518528
"@type": "@id"
519529
},
520530
"subclass_of": {
521-
"@type": "@id",
522-
"@id": "rdfs:subClassOf"
531+
"@type": "@id"
523532
},
524533
"subproperty_of": {
525534
"@type": "@id",
@@ -581,6 +590,9 @@
581590
"value": {
582591
"@id": "skos:example"
583592
},
593+
"object": {
594+
"@type": "@id"
595+
},
584596
"value_presence": {
585597
"@context": {
586598
"@vocab": "@null",

‎linkml_model/jsonld/meta.model.context.jsonld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"_comments": "Auto generated from meta.yaml by jsonldcontextgen.py version: 0.1.1\n Generation date: 2022-07-14T00:56:26\n Schema: meta\n metamodel version: 1.7.0\n model version: 2.0.0\n \n id: https://w3id.org/linkml/meta\n description: The metamodel for schemas defined using the Linked Data Modeling Language framework.\n\nFor more information on LinkML, see [linkml.io](https://linkml.io)\n\nCore metaclasses:\n\n* [SchemaDefinition](https://w3id.org/linkml/SchemaDefinition)\n* [ClassDefinition](https://w3id.org/linkml/ClassDefinition)\n* [SlotDefinition](https://w3id.org/linkml/SlotDefinition)\n* [TypeDefinition](https://w3id.org/linkml/TypeDefinition)\n\nEvery LinkML model instantiates SchemaDefinition, all classes in\nthe model instantiate ClassDefinition, and so on\n\nNote that the LinkML metamodel instantiates itself.\n\nFor a non-normative introduction to LinkML schemas, see the tutorial\nand schema guide on [linkml.io/linkml].\n\nFor canonical reference documentation on any metamodel construct,\nrefer to the official URI for each construct, e.g.\n[https://w3id.org/linkml/is_a](https://w3id.org/linkml/is_a)\n license: https://creativecommons.org/publicdomain/zero/1.0/\n ",
2+
"_comments": "Auto generated from meta.yaml by jsonldcontextgen.py version: 0.1.1\n Generation date: 2022-07-13T17:56:58\n Schema: meta\n metamodel version: 1.7.0\n model version: 2.0.0\n \n id: https://w3id.org/linkml/meta\n description: The metamodel for schemas defined using the Linked Data Modeling Language framework.\n\nFor more information on LinkML, see [linkml.io](https://linkml.io)\n\nCore metaclasses:\n\n* [SchemaDefinition](https://w3id.org/linkml/SchemaDefinition)\n* [ClassDefinition](https://w3id.org/linkml/ClassDefinition)\n* [SlotDefinition](https://w3id.org/linkml/SlotDefinition)\n* [TypeDefinition](https://w3id.org/linkml/TypeDefinition)\n\nEvery LinkML model instantiates SchemaDefinition, all classes in\nthe model instantiate ClassDefinition, and so on\n\nNote that the LinkML metamodel instantiates itself.\n\nFor a non-normative introduction to LinkML schemas, see the tutorial\nand schema guide on [linkml.io/linkml].\n\nFor canonical reference documentation on any metamodel construct,\nrefer to the official URI for each construct, e.g.\n[https://w3id.org/linkml/is_a](https://w3id.org/linkml/is_a)\n license: https://creativecommons.org/publicdomain/zero/1.0/\n ",
33
"@context": {
44
"IAO": {
55
"@id": "http://purl.obolibrary.org/obo/IAO_",

‎linkml_model/jsonld/types.model.context.jsonld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"_comments": "Auto generated from types.yaml by jsonldcontextgen.py version: 0.1.1\n Generation date: 2022-07-14T00:56:20\n Schema: types\n metamodel version: 1.7.0\n model version: 2.0.0\n \n id: https://w3id.org/linkml/types\n description: Shared type definitions for the core LinkML mode and metamodel\n license: https://creativecommons.org/publicdomain/zero/1.0/\n ",
2+
"_comments": "Auto generated from types.yaml by jsonldcontextgen.py version: 0.1.1\n Generation date: 2022-07-13T17:56:55\n Schema: types\n metamodel version: 1.7.0\n model version: 2.0.0\n \n id: https://w3id.org/linkml/types\n description: Shared type definitions for the core LinkML mode and metamodel\n license: https://creativecommons.org/publicdomain/zero/1.0/\n ",
33
"@context": {
44
"linkml": "https://w3id.org/linkml/",
55
"shex": "http://www.w3.org/ns/shex#",

‎linkml_model/jsonschema/meta.schema.json‎

Lines changed: 6920 additions & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)