Skip to content

Commit 97127ba

Browse files
author
oerc0042
committed
fixes #615, more tests on rdf conversion
1 parent 778d6e6 commit 97127ba

9 files changed

Lines changed: 962 additions & 957 deletions

isa-cookbook/content/notebooks/ISA-json to ISA-Tab and back to ISA-json - roundtrip.ipynb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"metadata": {},
88
"outputs": [],
99
"source": [
10-
"!pip install git+https://github.com/isa-tools/isa-api.git@develop"
10+
"#!pip install git+https://github.com/isa-tools/isa-api.git@develop"
1111
]
1212
},
1313
{
@@ -125,6 +125,14 @@
125125
"metadata": {},
126126
"outputs": [],
127127
"source": []
128+
},
129+
{
130+
"cell_type": "code",
131+
"execution_count": null,
132+
"id": "e7699e28-dac1-44f0-be46-5b8c732de381",
133+
"metadata": {},
134+
"outputs": [],
135+
"source": []
128136
}
129137
],
130138
"metadata": {

isa-cookbook/content/notebooks/isa-api-programmatic-rebuild-of-BII-S-3.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"metadata": {},
1414
"outputs": [],
1515
"source": [
16-
"!pip install -e ."
16+
"#!pip install -e ."
1717
]
1818
},
1919
{

isa-cookbook/content/notebooks/isa-json-conversion-to-rdf-linked-data.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"metadata": {},
4545
"outputs": [],
4646
"source": [
47-
"!pip install -e .\n"
47+
"#!pip install -e .\n"
4848
]
4949
},
5050
{
@@ -152,8 +152,8 @@
152152
"isa_json_ld_path = os.path.join(os.getcwd(),\"output/BII-S-3-synth/\", \"BII-S-3-isa-rdf-\" + ontology + \"-v3.json\")\n",
153153
"print(isa_json_ld_path)\n",
154154
"\n",
155-
"with open(isa_json_ld_path, 'w') as outfile:\n",
156-
" json.dump(jsonldcontent, outfile, ensure_ascii=False, indent=4)"
155+
"# with open(isa_json_ld_path, 'w') as outfile:\n",
156+
"# json.dump(jsonldcontent, outfile, ensure_ascii=False, indent=4)"
157157
]
158158
},
159159
{

isa-cookbook/content/notebooks/output/BII-S-3-synth/BII-S-3-isa-rdf-obo-v3.json

Lines changed: 278 additions & 269 deletions
Large diffs are not rendered by default.

isa-cookbook/content/notebooks/output/BII-S-3-synth/BII-S-3-isa-rdf-obo-v3.ttl

Lines changed: 393 additions & 411 deletions
Large diffs are not rendered by default.

isa-cookbook/content/notebooks/output/BII-S-3-synth/BII-S-3-isa.json

Lines changed: 271 additions & 265 deletions
Large diffs are not rendered by default.

isatools/resources/json-context/obo/isa_assay_obo_context.jsonld

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
"@type": "obo:OBI_0000968"
3636
},
3737
"materials": {
38-
"@id": "obo:OBI_0000047",
38+
"@id": "obo:COB_0000026",
3939
"@type": "obo:BFO_0000040"
4040
},
4141
"othermaterials": {
42-
"@id": "obo:OBI_0000047",
43-
"@type": "OBI_0000047"
42+
"@id": "obo:COB_0000026",
43+
"@type": "obo:COB_0000026"
4444
},
4545
"characteristicCategories": {
4646
"@id": "obo:IAO_0000235",

isatools/resources/json-context/obo/isa_material_obo_context.jsonld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"obo": "http://purl.obolibrary.org/obo/",
55
"xsd": "http://www.w3.org/2001/XMLSchema#",
66
"Material": {
7-
"@id": "obo:OBI_0000047"
7+
"@id": "obo:COB_0000026"
88
},
99
"type": {
1010
"@id": "obo:RO_0000086",

isatools/resources/json-context/obo/isa_obo_allinone_context.jsonld

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@id": "obo:OBI_0001933"
4040
},
4141
"Material": {
42-
"@id": "obo:OBI_0000047"
42+
"@id": "obo:COB_0000026"
4343
},
4444
"OntologyAnnotation": {
4545
"@id": "obo:OBI_0001933"
@@ -118,7 +118,7 @@
118118
"@type": "obo:OBI_0100051"
119119
},
120120
"otherMaterials": {
121-
"@id": "obo:OBI_0000047",
121+
"@id": "obo:COB_0000026",
122122
"@type": "obo:OBI_0000423"
123123
},
124124
"characteristics": {
@@ -171,7 +171,7 @@
171171
},
172172
"dataFiles": {
173173
"@id": "obo:EFO_0004095",
174-
"@type": "obo:OBI_0000047"
174+
"@type": "obo:MS_1000577"
175175
},
176176
"filename": {
177177
"@id": "obo:IAO_0000590",

0 commit comments

Comments
 (0)