Merge pull request #905 from bids-standard/tsv_custom_columns_update

Small updates to bring in line with spec.

Author: rwblair

bids-validator/bids_validator/rules/top_level_rules.json

@@ -1,6 +1,6 @@
 {
   "func_top": {
-    "regexp": "^\\/(?:ses-[a-zA-Z0-9]+_)?(?:recording-[a-zA-Z0-9]+_)?task-[a-zA-Z0-9]+(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:_echo-[0-9]+)?(@@@_func_top_ext_@@@)$",
+    "regexp": "^\\/(?:ses-[a-zA-Z0-9]+_)?(?:recording-[a-zA-Z0-9]+_)?task-[a-zA-Z0-9]+(?:_acq-[a-zA-Z0-9]+)?(?:_ce-[a-zA-Z0-9]+)?(?:_dir-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:_echo-[0-9]+)?(@@@_func_top_ext_@@@)$",
     "tokens": {
       "@@@_func_top_ext_@@@": [
         "_bold\\.json",

bids-validator/bids_validator/tsv/non_custom_columns.json

@@ -39,7 +39,7 @@
     "value"
   ],
   "misc": [],
-  "participants": ["participant_id"],
+  "participants": ["participant_id", "age", "sex"],
   "phenotype": ["participant_id"],
   "scans": ["acq_time", "filename"],
   "sessions": ["acq_time", "session_id"]

bids-validator/tests/bids.spec.js

@@ -134,7 +134,7 @@ describe('BIDS example datasets ', function() {
         errors.findIndex(error => error.code === 60) > -1,
         'errors do not contain a code 60',
       )
-      assert.deepEqual(warnings.length, 4)
+      assert.deepEqual(warnings.length, 3)
       assert(
         warnings.findIndex(warning => warning.code === 13) > -1,
         'warnings do not contain a code 13',