wip: First attempt at dfg-cp-survey schema update to use things/v2 #9

Draft
jsheunis wants to merge 5 commits from dfg-cps-2026 into main
Member

Towards #8

  • removed all old datalad-concepts prefixes, replaced with latest ones (also in emit_prefixes)
  • add latest datalad-concepts schema imports
  • remove YYYY and YYYYMM types
  • changed all ranges of date-related slots to W3CISO8601
  • changed is_a: FlatThing to is_a: Thing
  • added PROV mixins to relevant classes
  • removed all sh:order annotations

I've ran make build/linkml-docs/s/dfg-cp-survey/unreleased and it generated the shacl / owl / yaml without throwing errors. Not sure yet if this means anything...

TODO:

  • should orcid slot be fully removed in favor of commonly used identifier pattern? or is it good for simple UX to keep the slot explicit
  • examples not updated yet
  • ...
Towards https://hub.trr379.de/q02/concepts.trr379.de/issues/8 - removed all old datalad-concepts `prefixes`, replaced with latest ones (also in `emit_prefixes`) - add latest datalad-concepts schema `imports` - remove `YYYY` and `YYYYMM` types - changed all ranges of date-related slots to `W3CISO8601` - changed `is_a: FlatThing` to `is_a: Thing` - added PROV mixins to relevant classes - removed all `sh:order` annotations I've ran `make build/linkml-docs/s/dfg-cp-survey/unreleased` and it generated the shacl / owl / yaml without throwing errors. Not sure yet if this means anything... TODO: - should `orcid` slot be fully removed in favor of commonly used `identifier` pattern? or is it good for simple UX to keep the slot explicit - examples not updated yet - ...
First attempt at schema update to use things/v2, prov mixins, and more
Some checks failed
Validate examples and verify unmodified conversion / lint (pull_request) Failing after 51s
Model checks / lint (pull_request) Failing after 55s
Codespell / Check for spelling errors (pull_request) Has been cancelled
3311345a2b
- removed all old datalad-concepts 'prefixes', replaced with latest ones (also in 'emit_prefixes')
- add latest datalad-concepts schema 'imports'
- remove 'YYYY' and 'YYYYMM' types
- changed all ranges of date-related slots to 'W3CISO8601'
- changed 'is_a: FlatThing' to 'is_a: Thing'
- added PROV mixins to relevant classes
- removed all 'sh:order' annotations
jsheunis changed title from First attempt at dfg-cp-survey schema update to use things/v2, prov mixins, and more to WIP:First attempt at dfg-cp-survey schema update to use things/v2, prov mixins, and more 2026-09-10 21:07:40 +00:00
jsheunis changed title from WIP:First attempt at dfg-cp-survey schema update to use things/v2, prov mixins, and more to wip: First attempt at dfg-cp-survey schema update to use things/v2, prov mixins 2026-09-10 21:07:56 +00:00
Member

I know it's WIP but I was looking at this today to see what the update involves and I would suggest we change the description of the discipline now that we want to use a different Destatis classification:

diff --git a/src/dfg-cp-survey/unreleased.yaml b/src/dfg-cp-survey/unreleased.yaml
index f0ca3a1a02..20984d693d 100644
--- a/src/dfg-cp-survey/unreleased.yaml
+++ b/src/dfg-cp-survey/unreleased.yaml
@@ -504,9 +504,10 @@
     mixins:
       - EntityMixin
     description: >-
-      Fixed set of knowledge and study branches, as defined by the Federal
-      Statistical Office of Germany (https://www.destatis.de),
-      including "Fächergruppen", "Studienbereiche", and "Studienfächer".
+      Fixed set of teaching and research fields and subject areas, as
+      defined by the Federal Statistical Office of Germany
+      (https://www.destatis.de), including "Fächergruppen", "Lehr- und
+      Forschungsbereiche" and "Fachgebiete".
     slots:
       - name
       - part_of

Also, probably of minor relevance, I would weaken the Discipline's mapping to obo:GSSO_002345 from exact mapping to close mapping but I don't have a good feel for that (the meaning of the terms is essentially is the same, but the "knowledge field" in Gender, Sex, and Sexual Orientation ontology has specific subclasses while we don't have subclasses but we expect instances to be limited to Destatis terms).

I know it's WIP but I was looking at this today to see what the update involves and I would suggest we change the description of the discipline now that we want to use a different Destatis classification: ```diff diff --git a/src/dfg-cp-survey/unreleased.yaml b/src/dfg-cp-survey/unreleased.yaml index f0ca3a1a02..20984d693d 100644 --- a/src/dfg-cp-survey/unreleased.yaml +++ b/src/dfg-cp-survey/unreleased.yaml @@ -504,9 +504,10 @@ mixins: - EntityMixin description: >- - Fixed set of knowledge and study branches, as defined by the Federal - Statistical Office of Germany (https://www.destatis.de), - including "Fächergruppen", "Studienbereiche", and "Studienfächer". + Fixed set of teaching and research fields and subject areas, as + defined by the Federal Statistical Office of Germany + (https://www.destatis.de), including "Fächergruppen", "Lehr- und + Forschungsbereiche" and "Fachgebiete". slots: - name - part_of ``` Also, probably of minor relevance, I would weaken the Discipline's mapping to [obo:GSSO_002345](https://ontobee.org/ontology/GSSO?iri=http://purl.obolibrary.org/obo/GSSO_002345) from exact mapping to close mapping but I don't have a good feel for that (the meaning of the terms is essentially is the same, but the "knowledge field" in Gender, Sex, and Sexual Orientation ontology has specific subclasses while we don't have subclasses but we expect instances to be limited to Destatis terms).
fine tune dfg-cps schema update
Some checks failed
Validate examples and verify unmodified conversion / lint (pull_request) Failing after 54s
Model checks / lint (pull_request) Failing after 59s
Codespell / Check for spelling errors (pull_request) Has been cancelled
3922b62165
- trim imports to only necessary schemas
- remove unused PROV mixins
- emit missing trr379dfgsurvey prefix
- fix enum option text
jsheunis changed title from wip: First attempt at dfg-cp-survey schema update to use things/v2, prov mixins to wip: First attempt at dfg-cp-survey schema update to use things/v2 2026-09-22 05:29:54 +00:00
Update Discipline desription to match new destatis classification
Some checks failed
Validate examples and verify unmodified conversion / lint (pull_request) Failing after 53s
Model checks / lint (pull_request) Failing after 58s
Codespell / Check for spelling errors (pull_request) Has been cancelled
ecc5559118
pin linkml version to recent commit in main, until a new release is made
Some checks failed
Model checks / lint (pull_request) Failing after 57s
Validate examples and verify unmodified conversion / lint (pull_request) Failing after 57s
Codespell / Check for spelling errors (pull_request) Has been cancelled
9d833ebddb
This is in order to deal with a bug in 1.11+ that caused
failure when enums were part of a list
Establish df-cp-survey 2026 schema, update unreleased, add patches, depend on recent commit in linkml main
Some checks failed
Model checks / lint (pull_request) Failing after 1m4s
Validate examples and verify unmodified conversion / lint (pull_request) Failing after 1m4s
Codespell / Check for spelling errors (pull_request) Has been cancelled
05b9e4d710
Some checks failed
Model checks / lint (pull_request) Failing after 1m4s
Validate examples and verify unmodified conversion / lint (pull_request) Failing after 1m4s
Codespell / Check for spelling errors (pull_request) Has been cancelled
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin dfg-cps-2026:dfg-cps-2026
git switch dfg-cps-2026

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff dfg-cps-2026
git switch dfg-cps-2026
git rebase main
git switch main
git merge --ff-only dfg-cps-2026
git switch dfg-cps-2026
git rebase main
git switch main
git merge --no-ff dfg-cps-2026
git switch main
git merge --squash dfg-cps-2026
git switch main
git merge --ff-only dfg-cps-2026
git switch main
git merge dfg-cps-2026
git push origin main
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
q02/concepts.trr379.de!9
No description provided.