Skip to content

Commit b637335

Browse files
Merge branch 'bids-standard:master' into master
2 parents 1a059fc + 4702e40 commit b637335

34 files changed

+6061
-1041
lines changed

.all-contributorsrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,9 @@
424424
"profile": "https://github.com/musicinmybrain"
425425
},
426426
{
427+
"avatar_url": [
428+
"https://avatars.githubusercontent.com/u/844306?v=4"
429+
],
427430
"contributions": [
428431
"doc",
429432
"code",
@@ -434,9 +437,6 @@
434437
"profile": "https://bendichter.com/"
435438
},
436439
{
437-
"avatar_url": [
438-
"https://avatars.githubusercontent.com/u/844306?v=4"
439-
],
440440
"contributions": [
441441
"doc"
442442
],

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,15 @@ updates:
1919
interval: "monthly"
2020
labels:
2121
- "exclude-from-changelog"
22+
groups:
23+
build-dependencies:
24+
patterns: ["*"]
25+
- package-ecosystem: "npm"
26+
directory: "/"
27+
schedule:
28+
interval: "monthly"
29+
labels:
30+
- "exclude-from-changelog"
31+
groups:
32+
node-utilities:
33+
patterns: ["*"]

.github/workflows/changelog_generator.yml

Lines changed: 0 additions & 134 deletions
This file was deleted.

.github/workflows/publish_schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
fetch-depth: 0
3434
filter: "blob:none"
35-
- uses: actions/setup-python@v5
35+
- uses: actions/setup-python@v6
3636
with:
3737
python-version: 3
3838
- run: env

.github/workflows/schemacode_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
- uses: actions/checkout@v5
135135

136136
- name: Set Up Python environment
137-
uses: actions/setup-python@v5
137+
uses: actions/setup-python@v6
138138
with:
139139
python-version: "3.11"
140140

.github/workflows/validation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v5
27-
- uses: actions/setup-node@v4
27+
- uses: actions/setup-node@v5
2828
with:
2929
node-version: 22
3030
- name: Install dependencies
31-
run: npm install `cat npm-requirements.txt`
31+
run: npm install
3232
- name: Run style checks
33-
run: npx remark src/**/*.md --frail --rc-path .remarkrc
33+
run: npm run remark
3434

3535
# YAML
3636
yamllint:

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ pdf_build_src/src_copy
1414
pdf_build_src/tests/data/output
1515

1616
# JS/NPM
17-
package-lock.json
18-
package.json
1917
node_modules/
2018

2119
# Python gitignore

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
- id: check-added-large-files
1818
- id: check-case-conflict
1919
- repo: https://github.com/python-jsonschema/check-jsonschema
20-
rev: 0.33.3
20+
rev: 0.34.0
2121
hooks:
2222
- id: check-dependabot
2323
- id: check-github-workflows
@@ -49,7 +49,7 @@ repos:
4949
- id: codespell
5050
args: ["--config=.codespellrc", "--dictionary=-", "--dictionary=.codespell_dict"]
5151
- repo: https://github.com/pre-commit/mirrors-mypy
52-
rev: v1.17.1
52+
rev: v1.18.2
5353
hooks:
5454
- id: mypy
5555
# Sync with project.optional-dependencies.typing

CONTRIBUTING.md

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -293,48 +293,41 @@ NodeJS.
293293
Remark-CLI can be installed via [npm](https://www.npmjs.com/), which is part of
294294
the NodeJS distribution.
295295

296-
To install the packages we use for our style guide, the following command will
297-
work on most command lines:
296+
To install the packages we use for our style guide, use the following command:
298297

299298
```shell
300-
npm install `cat npm-requirements.txt`
301-
```
302-
303-
The equivalent command on PowerShell is:
304-
305-
```shell
306-
npm install @(cat npm-requirements.txt)
299+
npm install
307300
```
308301

309302
### 3. Find documents that are failing the check
310303

311304
Run the following from the root directory of `bids-specification`:
312305

313306
```shell
314-
npx remark ./src/*.md ./src/*/*.md
307+
npm run remark
315308
```
316309

317310
### 4. Fix the flagged document
318311

319312
Please go to the directory where the flagged file is and run remark like this:
320313

321314
```shell
322-
npx remark flagged_file.md -o flagged_file_fixed.md
315+
npx remark path/to/flagged_file.md -o path/to/flagged_file_fixed.md
323316
```
324317

325-
Please confirm this has fixed the file. To do this, please run this:
318+
To confirm this has fixed the file, run:
326319

327320
```shell
328-
npx remark flagged_file_fixed.md --frail
321+
npx remark path/to/flagged_file_fixed.md --frail
329322
```
330323

331324
This command will indicate whether this file now conforms to the style guide.
332325
If it passes, replace `flagged_file.md` with the contents of
333326
`flagged_file_fixed.md`, add and commit the change:
334327

335328
```shell
336-
mv flagged_file_fixed.md flagged_file.md
337-
git add flagged_file.md
329+
mv path/to/flagged_file_fixed.md path/to/flagged_file.md
330+
git add path/to/flagged_file.md
338331
git commit -m 'STY: Fixed Markdown style'
339332
```
340333

Maintainers_Guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ See also: [BIDS governance](https://bids.neuroimaging.io/collaboration/governanc
1515

1616
| Name | Time commitment | Scope | Joined |
1717
| ---------------------------------------------------------------------------- | --------------- | ------------------------------------- | -------- |
18-
| Stefan Appelhoff ([@sappelhoff](https://github.com/sappelhoff)) | 1h/week | | Mar 2020 |
1918
| Chris Markiewicz ([@effigies](https://github.com/effigies)) | 5h/week | | Mar 2020 |
2019
| Ross Blair ([@rwblair](https://github.com/rwblair)) | | Maintainer of the bids-validator | Mar 2020 |
2120
| Taylor Salo ([@tsalo](https://github.com/tsalo)) | 3h/week | MRI | Sep 2020 |
@@ -48,6 +47,7 @@ See also: [BIDS governance](https://bids.neuroimaging.io/collaboration/governanc
4847
| Name | Duration |
4948
| ------------------------------------------------------------------------------ | ------------------- |
5049
| Franklin Feingold ([@franklin-feingold](https://github.com/franklin-feingold)) | Mar 2020 - Jul 2022 |
50+
| Stefan Appelhoff ([@sappelhoff](https://github.com/sappelhoff)) | Mar 2020 - Aug 2025 |
5151

5252
## Why become a maintainer?
5353

0 commit comments

Comments
 (0)