Skip to content

Commit bf2a687

Browse files
Merge branch 'bids-standard:master' into master
2 parents b637335 + 63d5362 commit bf2a687

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2391
-1073
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
--ignore-url 'https://dicomlookup.com/dicomtags/.*' \
4848
--ignore-url 'https://www.instagram.com/bidsstandard/' \
4949
--ignore-url 'https://jsoneditoronline.org' \
50+
--ignore-url 'https://rrid.site.*' \
5051
~/project/site/*html ~/project/site/*/*.html
5152
else
5253
echo "Release PR - do nothing"

.github/dependabot.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ updates:
1313
actions-infrastructure:
1414
patterns:
1515
- "actions/*"
16+
cooldown:
17+
default-days: 14
1618
- package-ecosystem: "uv"
1719
directory: "/"
1820
schedule:
@@ -22,6 +24,8 @@ updates:
2224
groups:
2325
build-dependencies:
2426
patterns: ["*"]
27+
cooldown:
28+
default-days: 14
2529
- package-ecosystem: "npm"
2630
directory: "/"
2731
schedule:
@@ -31,3 +35,18 @@ updates:
3135
groups:
3236
node-utilities:
3337
patterns: ["*"]
38+
cooldown:
39+
default-days: 14
40+
- package-ecosystem: "npm"
41+
target-branch: jsr-maint
42+
directory: "/"
43+
schedule:
44+
interval: "monthly"
45+
labels:
46+
- "exclude-from-changelog"
47+
- "schema-code"
48+
groups:
49+
node-utilities:
50+
patterns: ["*"]
51+
cooldown:
52+
default-days: 14

.github/workflows/publish_schema.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,17 @@ jobs:
5656
git checkout -t origin/$JSR_BRANCH
5757
env:
5858
JSR_BRANCH: ${{ steps.branch.outputs.branch }}
59+
- uses: actions/setup-node@v6
60+
with:
61+
node-version: 24
62+
cache: 'npm'
63+
- name: Install npm tools
64+
run: npm install
65+
- name: Verify installed versions
66+
run: |
67+
npx quicktype --version
68+
npx json2ts --help | head -n2
69+
npx jsr --version
5970
- name: Regenerate schema
6071
run: bst export > schema.json
6172
- name: Regenerate context types
@@ -67,7 +78,7 @@ jobs:
6778
run: |
6879
# Name the file schema so the type will be named Schema
6980
bst export-metaschema > /tmp/schema.json
70-
npx --package=json-schema-to-typescript json2ts --unknownAny /tmp/schema.json > metaschema.ts
81+
npx json2ts --unknownAny /tmp/schema.json > metaschema.ts
7182
- name: Determine next version
7283
id: version
7384
run: |

.github/workflows/schemacode_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
fetch-depth: 0
3535
- name: Install the latest version of uv
36-
uses: astral-sh/setup-uv@v6
36+
uses: astral-sh/setup-uv@v7
3737
if: ${{ startsWith(github.ref, 'refs/tags/schema-') }}
3838
- name: "Build archive on tag"
3939
run: |
@@ -65,7 +65,7 @@ jobs:
6565
- uses: actions/checkout@v5
6666

6767
- name: Set up Python ${{ matrix.python-version }} (uv)
68-
uses: astral-sh/setup-uv@v6
68+
uses: astral-sh/setup-uv@v7
6969
with:
7070
python-version: ${{ matrix.python-version }}
7171
activate-environment: true

.github/workflows/validation.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- uses: actions/checkout@v5
40-
- uses: astral-sh/setup-uv@v6
40+
- uses: astral-sh/setup-uv@v7
4141
- name: Lint yml files in src/schema
4242
run: uvx yamllint -f standard src/schema/ -c .yamllint.yml
4343

@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- uses: actions/checkout@v5
49-
- uses: astral-sh/setup-uv@v6
49+
- uses: astral-sh/setup-uv@v7
5050
- run: uvx ruff format --diff
5151
- run: uvx ruff check
5252

@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- uses: actions/checkout@v5
58-
- uses: astral-sh/setup-uv@v6
58+
- uses: astral-sh/setup-uv@v7
5959
- name: Check for Latin phrases
6060
run: uv run tools/no-bad-latin.py
6161

@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565
steps:
6666
- uses: actions/checkout@v5
67-
- uses: astral-sh/setup-uv@v6
67+
- uses: astral-sh/setup-uv@v7
6868
- name: Validate CITATION.cff
6969
run: uvx cffconvert --validate
7070
- name: Check for Zenodo compatibility

.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.34.0
20+
rev: 0.35.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.18.2
52+
rev: v1.19.0
5353
hooks:
5454
- id: mypy
5555
# Sync with project.optional-dependencies.typing

Maintainers_Guide.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ See also: [BIDS governance](https://bids.neuroimaging.io/collaboration/governanc
2626
| Kimberly Ray ([@KimberlyLRay](https://github.com/KimberlyLRay)) | 1h/week | | Nov 2022 |
2727
| Julia-Katharina Pfarr ([@julia-pfarr](https://github.com/julia-pfarr)) | 2h/week | | Mar 2025 |
2828
| Seyed (Yahya) Shirazi ([@neuromechanist](https://github.com/neuromechanist)) | 2h/week | ExG, multi-modal, events & annotations | Jul 2025 |
29+
| Boris Clénet ([@bclenet](https://github.com/bclenet)) | 2h/week | | Jul 2025 |
2930

3031
In addition to the [BIDS Governance](https://bids.neuroimaging.io/collaboration/governance.html#bids-maintainers-group)
3132
classification of a maintainer, maintainers may declare a limited scope of responsibility.

mkdocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ nav:
2424
- Near-Infrared Spectroscopy: modality-specific-files/near-infrared-spectroscopy.md
2525
- Motion: modality-specific-files/motion.md
2626
- Magnetic Resonance Spectroscopy: modality-specific-files/magnetic-resonance-spectroscopy.md
27+
- Electromyography: modality-specific-files/electromyography.md
2728
- Derivatives:
2829
- BIDS Derivatives: derivatives/introduction.md
2930
- Common data types and metadata: derivatives/common-data-types.md
@@ -51,6 +52,9 @@ nav:
5152
- Website: https://bids.neuroimaging.io/getting_started/
5253
- Tutorials: https://bids.neuroimaging.io/getting_started/tutorials/
5354
- GitHub repository: https://github.com/bids-standard/bids-starter-kit
55+
exclude_docs: |
56+
README.md
57+
pregh-changes.md
5458
theme:
5559
name: material
5660
favicon: images/favicon.png

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies = [
55
"bidsschematools[render]",
66
"mkdocs>=1.1.0",
77
"mkdocs-material>=5.4",
8-
"pymdown-extensions>=7.0.0",
8+
"pymdown-extensions>=9.2.0",
99
"mkdocs-branchcustomization-plugin~=0.1.3",
1010
"mkdocs-macros-plugin",
1111
"mkdocs-redirects",
@@ -60,3 +60,7 @@ replace = """NEXT_VERSION_HERE
6060
- '{new_version}'
6161
- """
6262
include_bumps = ['pre_label']
63+
64+
[[tool.mypy.overrides]]
65+
module = ["pymdownx.*"]
66+
ignore_missing_imports = true

0 commit comments

Comments
 (0)