Merge pull request #241 from hed-standard/main

Sync develop-score with main branch

.github/workflows/create_main_pr.yaml → .github/workflows/add_hed_ids.yaml

@@ -1,16 +1,23 @@
-name: Create PR from Develop
+name: Add HedIDs
 
 on:
   workflow_dispatch:
     inputs:
+      schema_name:
+        description: 'The name of the schema("standard" for standard schema)'
+        default: ''
+      schema_version:
+        description: 'The schema version to convert'
+        required: true
       pr_title:
         description: 'Pull Request Title'
         required: true
-        default: 'Update from Develop'
+        default: 'Adding HedIDs to schema on main'
       pr_description:
         description: 'Pull Request Description'
         required: true
-        default: 'Automatically updating the provisional branch with changes from develop.'
+        default: 'Automatically updating the schema from main with HedIDs'
+
 
 jobs:
   manage-branch:
@@ -34,17 +41,10 @@ jobs:
 
       - name: Create new provisional branch from develop
         run: |
-          git checkout develop
+          git checkout main
           git pull
           git checkout -b provisional
-          git push origin provisional
-
-      - name: Get changed files between main and provisional
-        id: changed-files
-        run: |
-          CHANGED_FILES=$(git diff --name-only origin/main..origin/provisional | tr '\n' ' ')
-          echo "CHANGED_FILES=${CHANGED_FILES}" >> $GITHUB_ENV
-          echo "List of changed files: $CHANGED_FILES"
+          git push origin main
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -56,7 +56,7 @@ jobs:
 
       - name: Update schemas
         run: |
-            hed_update_schemas $CHANGED_FILES --set-ids
+            hed_add_ids . "${{ github.event.inputs.schema_name }}" "${{ github.event.inputs.schema_version }}"
 
       - name: Commit and push changes
         run: |

README.md

@@ -1,7 +1,6 @@
 [![Documentation Status](https://readthedocs.org/projects/hed-schemas/badge/?version=latest)](https://hed-schemas.readthedocs.io/en/latest/?badge=latest)
 Standard:[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7876037.svg)](https://doi.org/10.5281/zenodo.7876037) 
 SCORE:[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7897596.svg)](https://doi.org/10.5281/zenodo.7897596)
-[![@HEDstandard](http://img.shields.io/twitter/follow/hedstandard.svg?style=social)](https://twitter.com/HEDstandard)
 
 ## About HED
 HED (Hierarchical Event Descriptors) is an evolving framework for the description and
@@ -33,8 +32,8 @@ The following table summarizes the current versions of the HED schemas.
 | Schema                                 | Latest<br/>version | Description                                                                                                                                                         | Prerelease<br/>version | DOI  |
 |----------------------------------------|--------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------| ---- |
 | [**standard**](./standard_schema)      | 8.3.0              | Basic vocabulary for annotating data.                                                                                                                               | 8.4.0                  | 10.5281/zenodo.7876037 |
-| [**score**](library_schemas/score)     | 1.1.0              | SCORE standard vocabulary for <br/>clinical neurological annotation<br/>(See [**Score docs**](https://hed-schemas.readthedocs.io/en/latest/hed_score_schema.html).) | 2.0.0                  | 10.5281/zenodo.7897596  |
-| [**lang**](library_schemas/lang)       |                    | LANG linguistic stimuli annotation vocabulary.                                                                                                                      | 0.0.1                  |  |
+| [**score**](library_schemas/score)     | 1.2.0              | SCORE standard vocabulary for <br/>clinical neurological annotation<br/>(See [**Score docs**](https://hed-schemas.readthedocs.io/en/latest/hed_score_schema.html).) | 2.0.0                  | 10.5281/zenodo.7897596  |
+| [**lang**](library_schemas/lang)       |                    | LANG linguistic stimuli annotation vocabulary.                                                                                                                      | 1.0.0                  |  |
 | [**testlib**](library_schemas/testlib) | 3.0.0              | A copy of the HED standard vocabulary<br/> for testing. <br/> (May not be stable.)                                                                                  | 4.0.0                  |  |
 
 ## HED formats

library_data.json

@@ -0,0 +1,11 @@
+{
+    "": {
+      "id_range":[10000, 39999]
+    },
+    "score": {
+      "id_range":[40000, 59999]
+    },
+    "lang": {
+      "id_range":[60000, 79999]
+    }
+}

library_schemas/lang/CONTRIBUTORS.md

@@ -0,0 +1,5 @@
+Contributors to the HED-lang effort:
+
+Ian Callanan, Monique Denissen, Florian Hutzler, Scott Makeig, Bernhard Pöll, Kay Robbins, Dung Truong
+
+*Please add your name here in alphabetical order if you are making a contribution.