Merge branch 'main' of github.com:openMetadataInitiative/openMINDS in…

…to main
openMetadataInitiative · Nov 13, 2023 · 238e939 · 238e939
2 parents d0185de + b57bba4
commit 238e939
Show file tree

Hide file tree

Showing 27 changed files with 55 additions and 706 deletions.
diff --git a/.github/workflows/openMINDS_upstream.yml b/.github/workflows/openMINDS_upstream.yml
@@ -0,0 +1,16 @@
+name: openMINDS_upstream
+
+on: 
+  - push
+  - workflow_dispatch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Trigger target repositories
+      run: |
+        curl -XPOST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/openMetadataInitiative/openMINDS_json-schema/actions/workflows/build.yml/dispatches --data '{"ref": "pipeline"}'
+        curl -XPOST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/openMetadataInitiative/openMINDS_MATLAB/actions/workflows/build.yml/dispatches --data '{"ref": "pipeline"}'
+        curl -XPOST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/openMetadataInitiative/openMINDS_Python/actions/workflows/build.yml/dispatches --data '{"ref": "pipeline"}'
+        curl -XPOST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/openMetadataInitiative/openMINDS_documentation/actions/workflows/build.yml/dispatches --data '{"ref": "pipeline"}'
diff --git a/schemas/latest/computation/dataAnalysis.schema.omi.json b/schemas/latest/computation/dataAnalysis.schema.omi.json
@@ -193,6 +193,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/computation/dataCopy.schema.omi.json b/schemas/latest/computation/dataCopy.schema.omi.json
@@ -192,6 +192,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/computation/genericComputation.schema.omi.json b/schemas/latest/computation/genericComputation.schema.omi.json
@@ -191,6 +191,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/computation/modelValidation.schema.omi.json b/schemas/latest/computation/modelValidation.schema.omi.json
@@ -198,6 +198,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/computation/optimization.schema.omi.json b/schemas/latest/computation/optimization.schema.omi.json
@@ -192,6 +192,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/computation/simulation.schema.omi.json b/schemas/latest/computation/simulation.schema.omi.json
@@ -192,6 +192,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/computation/validationTest.schema.omi.json b/schemas/latest/computation/validationTest.schema.omi.json
@@ -165,6 +165,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/computation/visualization.schema.omi.json b/schemas/latest/computation/visualization.schema.omi.json
@@ -191,6 +191,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/controlledTerms/tissueSampleType.schema.omi.json b/schemas/latest/controlledTerms/tissueSampleType.schema.omi.json
@@ -1,6 +1,7 @@
 {
   "_categories": [
-    "keyword"
+    "keyword",
+    "studyTarget"
   ],
   "_type": "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
   "color": "#0AA3F7",

diff --git a/schemas/latest/core/data/fileBundle.schema.omi.json b/schemas/latest/core/data/fileBundle.schema.omi.json
@@ -56,6 +56,7 @@
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/Technique",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/core/BehavioralProtocol",

diff --git a/schemas/latest/core/products/datasetVersion.schema.omi.json b/schemas/latest/core/products/datasetVersion.schema.omi.json
@@ -451,6 +451,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/core/products/model.schema.omi.json b/schemas/latest/core/products/model.schema.omi.json
@@ -155,6 +155,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/core/research/protocolExecution.schema.omi.json b/schemas/latest/core/research/protocolExecution.schema.omi.json
@@ -178,6 +178,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/ephys/activity/cellPatching.schema.omi.json b/schemas/latest/ephys/activity/cellPatching.schema.omi.json
@@ -181,6 +181,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/ephys/activity/electrodePlacement.schema.omi.json b/schemas/latest/ephys/activity/electrodePlacement.schema.omi.json
@@ -171,6 +171,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/ephys/activity/recordingActivity.schema.omi.json b/schemas/latest/ephys/activity/recordingActivity.schema.omi.json
@@ -181,6 +181,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/publications/book.schema.omi.json b/schemas/latest/publications/book.schema.omi.json
@@ -231,7 +231,7 @@
       "_formats": [
         "date"
       ],
-      "_instruction": "Enter the date on which this creative work was last modfied, formatted as '2023-02-07'.",
+      "_instruction": "Enter the date on which this creative work was last modified, formatted as '2023-02-07'.",
       "formatting": "text/plain",
       "label": "Modification date",
       "multiline": false,

diff --git a/schemas/latest/publications/chapter.schema.omi.json b/schemas/latest/publications/chapter.schema.omi.json
@@ -240,7 +240,7 @@
       "_formats": [
         "date"
       ],
-      "_instruction": "Enter the date on which this creative work was last modfied, formatted as '2023-02-07'.",
+      "_instruction": "Enter the date on which this creative work was last modified, formatted as '2023-02-07'.",
       "formatting": "text/plain",
       "label": "Modification date",
       "multiline": false,

diff --git a/schemas/latest/publications/learningResource.schema.omi.json b/schemas/latest/publications/learningResource.schema.omi.json
@@ -275,7 +275,7 @@
       "_formats": [
         "date"
       ],
-      "_instruction": "Enter the date on which this creative work was last modfied, formatted as '2023-02-07'.",
+      "_instruction": "Enter the date on which this creative work was last modified, formatted as '2023-02-07'.",
       "formatting": "text/plain",
       "label": "Modification date",
       "multiline": false,

diff --git a/schemas/latest/publications/livePaperResourceItem.schema.omi.json b/schemas/latest/publications/livePaperResourceItem.schema.omi.json
@@ -17,9 +17,11 @@
       "type": "string"
     },
     "https://openminds.ebrains.eu/vocab/hostedBy": {
-      "_instruction": "Add the host organization of this live paper resource item.",
+      "_instruction": "Add the web service or organization that hosts this live paper resource item.",
       "_linkedTypes": [
-        "https://openminds.ebrains.eu/core/Organization"
+        "https://openminds.ebrains.eu/core/Organization",
+        "https://openminds.ebrains.eu/core/WebService",
+        "https://openminds.ebrains.eu/controlledTerms/Service"
       ],
       "description": "Reference to an organization that provides facilities and services for something.",
       "label": "Hosted by",

diff --git a/schemas/latest/publications/scholarlyArticle.schema.omi.json b/schemas/latest/publications/scholarlyArticle.schema.omi.json
@@ -241,7 +241,7 @@
       "_formats": [
         "date"
       ],
-      "_instruction": "Enter the date on which this creative work was last modfied, formatted as '2023-02-07'.",
+      "_instruction": "Enter the date on which this creative work was last modified, formatted as '2023-02-07'.",
       "formatting": "text/plain",
       "label": "Modification date",
       "multiline": false,

diff --git a/schemas/latest/specimenPrep/activity/cranialWindowPreparation.schema.omi.json b/schemas/latest/specimenPrep/activity/cranialWindowPreparation.schema.omi.json
@@ -182,6 +182,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/latest/stimulation/activity/stimulationActivity.schema.omi.json b/schemas/latest/stimulation/activity/stimulationActivity.schema.omi.json
@@ -177,6 +177,7 @@
         "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
         "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
         "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+        "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
         "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
         "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
         "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",

diff --git a/schemas/v3.0/core/miscellaneous/funding.schema.omi.json b/schemas/v3.0/core/miscellaneous/funding.schema.omi.json
@@ -7,7 +7,7 @@
   "properties": {
     "https://openminds.ebrains.eu/vocab/acknowledgement": {
       "_instruction": "Enter the acknowledgement that should be used with this funding.",
-      "description": "Offical declaration or avowal of appreciation of an act or achievement.",
+      "description": "Official declaration or avowal of appreciation of an act or achievement.",
       "formatting": "text/plain",
       "label": "Acknowledgement",
       "multiline": false,

diff --git a/vocab/categories.json b/vocab/categories.json
@@ -217,6 +217,7 @@
       "https://openminds.ebrains.eu/controlledTerms/SubcellularEntity",
       "https://openminds.ebrains.eu/controlledTerms/TactileStimulusType",
       "https://openminds.ebrains.eu/controlledTerms/TermSuggestion",
+      "https://openminds.ebrains.eu/controlledTerms/TissueSampleType",
       "https://openminds.ebrains.eu/controlledTerms/UBERONParcellation",
       "https://openminds.ebrains.eu/controlledTerms/VisualStimulusType",
       "https://openminds.ebrains.eu/sands/CustomAnatomicalEntity",