Skip to content

Commit 0d0ea9b

Browse files
HendrikBorgeltHendrikBorgelt
committed
Normalize DOIs in examples, remove TTLs, update SHACL
Replace https://dx.doi.org/... identifiers with doi:... form in example outputs (AnalysisDataset-001.json / .yaml). Remove generated TTL example files (AnalysisDataset-001.ttl, Dataset-001.ttl) and add examples/output/README.md documenting inputs. Update project/jsonld metadata generation_date. Modify SHACL shape for dcatapplus:AnalysisDataset: reorder and adjust property constraints (add/remove/retype several properties such as contactPoint, conformsTo, subject/isReferencedBy, temporal/resolution fields, version/identifier handling, etc.). Also apply corresponding updates to datamodel code (src/dcat_ap_plus/datamodel/*) to reflect these changes.
1 parent 69e600b commit 0d0ea9b

8 files changed

Lines changed: 4873 additions & 2067 deletions

File tree

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,21 @@ repos:
1515
hooks:
1616
- id: yamllint
1717
args: [-c=.yamllint.yaml]
18+
exclude: ^examples/output/ # new
1819

1920
- repo: https://github.com/codespell-project/codespell
2021
rev: v2.4.1
2122
hooks:
2223
- id: codespell
2324
additional_dependencies:
2425
- tomli
26+
exclude: ^examples/output/ #new
2527

2628
- repo: https://github.com/crate-ci/typos
2729
rev: v1.39.2
2830
hooks:
2931
- id: typos
32+
exclude: ^examples/output/ # new
3033

3134
- repo: https://github.com/astral-sh/ruff-pre-commit
3235
# Ruff version.
@@ -35,6 +38,7 @@ repos:
3538
# Run the linter.
3639
- id: ruff
3740
args: [--fix, --exit-non-zero-on-fix]
41+
exclude: ^src/dcat_ap_plus/datamodel/ # new
3842
# Run the formatter.
3943
- id: ruff-format
4044

‎.yamllint.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ rules:
1010
allow-non-breakable-words: true
1111
allow-non-breakable-inline-mappings: true
1212
new-lines: disable # Don't check for type of new line characters.
13+
indentation:
14+
spaces: 2
15+
indent-sequences: true
16+
check-multi-line-strings: false

‎examples/output/AnalysisDataset-001.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1",
2+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1",
33
"description": [
44
"Dataset for 13C nuclear magnetic resonance spectroscopy (13C NMR)"
55
],
@@ -8,7 +8,7 @@
88
],
99
"was_generated_by": [
1010
{
11-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#NMRSpectralAnalysis",
11+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#NMRSpectralAnalysis",
1212
"description": [
1313
"Analysis of NMR spectra."
1414
],
@@ -18,16 +18,16 @@
1818
},
1919
"evaluated_entity": [
2020
{
21-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrum",
21+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrum",
2222
"was_generated_by": [
2323
{
24-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR",
24+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR",
2525
"title": [
2626
"CDCl3_13C_NMR"
2727
],
2828
"carried_out_by": [
2929
{
30-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrometer",
30+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrometer",
3131
"title": "Bruker 400 MHz",
3232
"description": "The NMR spectrometer used.",
3333
"rdf_type": {
@@ -36,7 +36,7 @@
3636
}
3737
},
3838
{
39-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Solvent",
39+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Solvent",
4040
"description": "used solvent",
4141
"has_part": [
4242
{
@@ -120,24 +120,24 @@
120120
},
121121
"evaluated_entity": [
122122
{
123-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
123+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
124124
"title": "CRS-50440"
125125
}
126126
]
127127
}
128128
]
129129
},
130130
{
131-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrum",
131+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrum",
132132
"was_generated_by": [
133133
{
134-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR",
134+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR",
135135
"title": [
136136
"DMSO_13C_NMR"
137137
],
138138
"carried_out_by": [
139139
{
140-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrometer",
140+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrometer",
141141
"title": "Bruker 400 MHz",
142142
"description": "used spectrometer",
143143
"rdf_type": {
@@ -146,7 +146,7 @@
146146
}
147147
},
148148
{
149-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Solvent",
149+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Solvent",
150150
"description": "used solvent",
151151
"has_part": [
152152
{
@@ -230,7 +230,7 @@
230230
},
231231
"evaluated_entity": [
232232
{
233-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
233+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
234234
"title": "CRS-50440"
235235
}
236236
]
@@ -254,13 +254,13 @@
254254
],
255255
"is_about_entity": [
256256
{
257-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
257+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
258258
"title": "CRS-50440",
259259
"description": "The analysed chemical substance sample CRS-50440.",
260260
"has_part": [
261261
{
262-
"id": "https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2#EvaluatedCompound",
263-
"description": "compound assigned to https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
262+
"id": "doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2#EvaluatedCompound",
263+
"description": "compound assigned to doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2",
264264
"other_identifier": [
265265
{
266266
"notation": "https://pubchem.ncbi.nlm.nih.gov/compound/26248854"
@@ -343,4 +343,4 @@
343343
}
344344
],
345345
"@type": "AnalysisDataset"
346-
}
346+
}

‎examples/output/AnalysisDataset-001.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1
1+
id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1
22
description:
33
- Dataset for 13C nuclear magnetic resonance spectroscopy (13C NMR)
44
title:
55
- 13C nuclear magnetic resonance spectroscopy (13C NMR)
66
was_generated_by:
7-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#NMRSpectralAnalysis
7+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#NMRSpectralAnalysis
88
description:
99
- Analysis of NMR spectra.
1010
rdf_type:
1111
id: NMR:1400042
1212
title: NMR data processing
1313
evaluated_entity:
14-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrum
14+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrum
1515
was_generated_by:
16-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR
16+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR
1717
title:
1818
- CDCl3_13C_NMR
1919
carried_out_by:
20-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrometer
20+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Spectrometer
2121
title: Bruker 400 MHz
2222
description: The NMR spectrometer used.
2323
rdf_type:
2424
id: OBI:0000566
2525
title: NMR instrument
26-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Solvent
26+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#CDCl3_13C_NMR_Solvent
2727
description: used solvent
2828
has_part:
2929
- id: https://pubchem.ncbi.nlm.nih.gov/compound/71583
@@ -76,21 +76,21 @@ was_generated_by:
7676
id: CHMO:0000595
7777
title: 13C nuclear magnetic resonance spectroscopy
7878
evaluated_entity:
79-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
79+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
8080
title: CRS-50440
81-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrum
81+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrum
8282
was_generated_by:
83-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR
83+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR
8484
title:
8585
- DMSO_13C_NMR
8686
carried_out_by:
87-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrometer
87+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Spectrometer
8888
title: Bruker 400 MHz
8989
description: used spectrometer
9090
rdf_type:
9191
id: OBI:0000566
9292
title: NMR instrument
93-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Solvent
93+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N/CHMO0000595.1#DMSO_13C_NMR_Solvent
9494
description: used solvent
9595
has_part:
9696
- id: https://pubchem.ncbi.nlm.nih.gov/compound/679
@@ -143,20 +143,20 @@ was_generated_by:
143143
id: CHMO:0000595
144144
title: 13C nuclear magnetic resonance spectroscopy
145145
evaluated_entity:
146-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
146+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
147147
title: CRS-50440
148148
other_identifier:
149149
- notation: https://www.chemotion-repository.net/pid/50434
150150
theme:
151151
- preferred_label:
152152
- TECH
153153
is_about_entity:
154-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
154+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
155155
title: CRS-50440
156156
description: The analysed chemical substance sample CRS-50440.
157157
has_part:
158-
- id: https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2#EvaluatedCompound
159-
description: compound assigned to https://dx.doi.org/10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
158+
- id: doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2#EvaluatedCompound
159+
description: compound assigned to doi:10.14272/UGRXAOUDHZOHPF-UHFFFAOYSA-N.2
160160
other_identifier:
161161
- notation: https://pubchem.ncbi.nlm.nih.gov/compound/26248854
162162
has_qualitative_attribute:

0 commit comments

Comments
 (0)