Skip to content

Commit 8062ee8

Browse files
authored
Merge pull request #2189 from bids-standard/rel/1.10.1
REL: v1.10.1
2 parents 429a107 + 18cb4ab commit 8062ee8

File tree

15 files changed

+362
-174
lines changed

15 files changed

+362
-174
lines changed

.all-contributorsrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,16 @@
423423
"name": "Benjamin Beasley",
424424
"profile": "https://github.com/musicinmybrain"
425425
},
426+
{
427+
"contributions": [
428+
"doc",
429+
"code",
430+
"test"
431+
],
432+
"login": "bendichter",
433+
"name": "Benjamin Dichter",
434+
"profile": "https://bendichter.com/"
435+
},
426436
{
427437
"avatar_url": [
428438
"https://avatars.githubusercontent.com/u/844306?v=4"

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
uvx linkchecker -t 1 --check-extern \
3939
--ignore-url 'file:///.*' \
4040
--ignore-url 'https://bids-specification.readthedocs.io/en/stable/.*' \
41+
--ignore-url "https://bids-specification.readthedocs.io/en/v${CIRCLE_BRANCH#rel/}/" \
4142
--ignore-url 'https://doi.org/.*' \
4243
--ignore-url 'https://fonts.gstatic.com' \
4344
--ignore-url 'https://github.com/[^/]*' \

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ abstract: >-
88
The Brain Imaging Data Structure (BIDS) is a simple and intuitive way to
99
organize and describe data.
1010
11-
version: 1.10.1-dev
11+
version: 1.10.1
1212

1313
license: CC-BY-4.0
1414

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ validate_citation_cff: CITATION.cff
66
update_contributors:
77
uv run tools/add_contributors.py
88
uv run tools/print_contributors.py
9-
npx all-contributors generate
9+
npx all-contributors-cli generate
1010

1111
runprettier:
1212
prettier --write "src/schema/**/*.yaml"

README.md

Lines changed: 108 additions & 77 deletions
Large diffs are not rendered by default.

Release_Protocol.md

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,20 @@ git checkout -b rel/1.2.0 upstream/master
4444

4545
#### 2.1 Update the version
4646

47-
Update the version in CITATION.cff.
47+
Update the specification and schema versions using [bump-my-version][]
48+
49+
50+
```Shell
51+
uvx bump-my-version bump pre_label
52+
(cd tools/schemacode; uvx bump-my-version bump pre_label)
53+
```
54+
55+
This will update the version in:
56+
57+
* `CITATION.cff`
58+
* `mkdocs.yml`
59+
* `src/schema/*_VERSION`
60+
* `src/schema/meta/versions.yaml`
4861

4962
Change the "Unreleased" heading in
5063
[src/CHANGES.md](https://github.com/bids-standard/bids-specification/blob/master/src/CHANGES.md)
@@ -59,20 +72,6 @@ the link.
5972

6073
The date can be changed or added later, so accurate prediction is not necessary.
6174

62-
Remove the `-dev` from the version in
63-
[mkdocs.yml](https://github.com/bids-standard/bids-specification/blob/master/mkdocs.yml)
64-
configuration, so the title will be correct for the released specification.
65-
If the version preceding the `-dev` is not the target version, update the version as well.
66-
In the figure below, we update `1.2.0-dev` to `1.2.0`.
67-
![dev-to-stable](release_images/site_name_release_1.2dev-1.2.png "dev-to-stable")
68-
69-
Additionally, implement the same change in the version name perform above in the `src/schema/BIDS_VERSION` file.
70-
71-
Note:
72-
this will make our continuous integration ([CircleCI](https://circleci.com/)) fail.
73-
This fails because the URL of the new ReadTheDocs rendering has not been generated at this time.
74-
It will be generated once the GitHub release has been completed.
75-
7675
#### 2.2 Update the contributors list
7776

7877
We want to ensure that all contributors are duly credited.
@@ -99,14 +98,7 @@ make update_contributors
9998
- make sure to review the changes and not commit them blindly
10099
- commit the changes
101100

102-
#### 2.3 Update the previous version URLs
103-
104-
In `src/CHANGES.md`,
105-
please change the previous version links from GitHub to ReadTheDocs.
106-
In the figure below, we update 1.2.2.
107-
![github-to-rtd](release_images/GitHub_to_RTD_spec_rendering.png "github-to-rtd")
108-
109-
#### 2.4 Update the Changelog
101+
#### 2.3 Update the Changelog
110102

111103
Review `src/CHANGES.md` to ensure that the document produces a changelog that is useful to a
112104
reader of the specification.
@@ -116,10 +108,6 @@ You can also make use of the `exclude-from-changelog` label.
116108
Adding this label to PRs in the GitHub web interface will prevent the changelog generator from
117109
considering this item for inclusion in the changelog.
118110

119-
#### 2.5 Update the schema
120-
121-
Add the new version to `src/schema/meta/versions.yaml`.
122-
123111
### 3. Commit changes and push to upstream
124112

125113
By pushing `rel/` branches to the main repository, the chances of continuous integration
@@ -284,3 +272,5 @@ If the release relates to the merge of a BEP, add the BEP leads to the BIDS advi
284272

285273
Please share news of the release on the [identified platforms](https://github.com/bids-standard/bids-specification?tab=readme-ov-file#BIDS-communication-channels).
286274
Please use our previous release posts as a guide.
275+
276+
[bump-my-version]: https://callowayproject.github.io/bump-my-version/

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
site_name: Brain Imaging Data Structure 1.10.1-dev
1+
site_name: Brain Imaging Data Structure 1.10.1
22
site_url: https://bids-specification.readthedocs.io/en/stable/
33
repo_url: https://github.com/bids-standard/bids-specification
44
nav:

pyproject.toml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,34 @@ doc = [
2626
"universal_pathlib",
2727
"fsspec[http]",
2828
]
29+
30+
[tool.bumpversion]
31+
current_version = "1.10.1"
32+
parse = """(?x)
33+
(?P<major>[0-9]+)
34+
\\.(?P<minor>[0-9]+)
35+
\\.(?P<patch>[0-9]+)
36+
(?:-(?P<pre_label>dev))?
37+
"""
38+
serialize = ["{major}.{minor}.{patch}-{pre_label}", "{major}.{minor}.{patch}"]
39+
commit = true
40+
message = "chore: Bump BIDS version to {new_version}"
41+
42+
[tool.bumpversion.parts.pre_label]
43+
values = ["dev", "final"]
44+
optional_value = "final"
45+
46+
[[tool.bumpversion.files]]
47+
filename = "CITATION.cff"
48+
[[tool.bumpversion.files]]
49+
filename = "mkdocs.yml"
50+
[[tool.bumpversion.files]]
51+
filename = "src/schema/BIDS_VERSION"
52+
[[tool.bumpversion.files]]
53+
filename = "src/schema/meta/versions.yaml"
54+
search = """NEXT_VERSION_HERE
55+
- """
56+
replace = """NEXT_VERSION_HERE
57+
- '{new_version}'
58+
- """
59+
include_bumps = ['pre_label']

src/CHANGES.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
# Changelog
22

3+
## [v1.10.1](https://bids-specification.readthedocs.io/en/v1.10.1/) (2025-09-03)
4+
5+
- \[ENH] Expand fieldmaps section to include B1 maps, including qMRI maps [#2183](https://github.com/bids-standard/bids-specification/pull/2183) ([tsalo](https://github.com/tsalo))
6+
- \[ENH] Clarify that task label is not required to derive from TaskName [#2179](https://github.com/bids-standard/bids-specification/pull/2179) ([effigies](https://github.com/effigies))
7+
- \[ENH] Remove explicitly worded requirement of events file association with the task [#1440](https://github.com/bids-standard/bids-specification/pull/1440) ([yarikoptic](https://github.com/yarikoptic))
8+
- \[ENH] Clarify that recording entity may be used to distinguish recording instruments [#2090](https://github.com/bids-standard/bids-specification/pull/2090) ([drammock](https://github.com/drammock))
9+
- \[ENH] Specify that dir-<label> should correspond to PhaseEncodingDirection [#2097](https://github.com/bids-standard/bids-specification/pull/2097) ([effigies](https://github.com/effigies))
10+
- \[ENH] Allow direction entity in MESE files [#2100](https://github.com/bids-standard/bids-specification/pull/2100) ([tsalo](https://github.com/tsalo))
11+
- \[ENH] Add "study" DatasetType to organize a collection of source and derivative datasets [#1972](https://github.com/bids-standard/bids-specification/pull/1972) ([yarikoptic](https://github.com/yarikoptic))
12+
- \[ENH] Deprecate 89+ string for default age column, increase expressiveness of column definitions in sidecar files [#2162](https://github.com/bids-standard/bids-specification/pull/2162) ([effigies](https://github.com/effigies))
13+
- \[ENH] Update extension citations in Introduction [#2168](https://github.com/bids-standard/bids-specification/pull/2168) ([markmikkelsen](https://github.com/markmikkelsen))
14+
- \[ENH] Add "Keywords" to `dataset_description.json` [#2158](https://github.com/bids-standard/bids-specification/pull/2158) ([markmikkelsen](https://github.com/markmikkelsen))
15+
- \[ENH] Update AcquisitionDuration definition to match DICOM, define FrameAcquisitionDuration for sparse sequences [#1974](https://github.com/bids-standard/bids-specification/pull/1974) ([effigies](https://github.com/effigies))
16+
- \[ENH] Inheritance Principle: Advise against value overloading. Plan to deprecate support for overloading for BIDS 2.0 [#1834](https://github.com/bids-standard/bids-specification/pull/1834) ([Lestropie](https://github.com/Lestropie))
17+
- \[ENH] Allow `mod-*` entity to relate physio data to MRI data in `anat/` [#1991](https://github.com/bids-standard/bids-specification/pull/1991) ([tstoeter](https://github.com/tstoeter))
18+
- \[ENH] Accept UTC offsets in datetimes [#2001](https://github.com/bids-standard/bids-specification/pull/2001) ([effigies](https://github.com/effigies))
19+
- \[ENH] Clarify that electrodes.tsv are REQUIRED for iEEG data [#1896](https://github.com/bids-standard/bids-specification/pull/1896) ([effigies](https://github.com/effigies))
20+
- \[ENH] Allow additional columns if defined for various TSV files [#2054](https://github.com/bids-standard/bids-specification/pull/2054) ([effigies](https://github.com/effigies))
21+
- \[ENH] Reorganise modality agnostic files section into multiple pages [#2106](https://github.com/bids-standard/bids-specification/pull/2106) ([bclenet](https://github.com/bclenet))
22+
- \[ENH] Define "phenotype" as a data type not nested inside subjects [#2050](https://github.com/bids-standard/bids-specification/pull/2050) ([effigies](https://github.com/effigies))
23+
- \[ENH] Formalize presence of optional docs/ folder [#2104](https://github.com/bids-standard/bids-specification/pull/2104) ([yarikoptic](https://github.com/yarikoptic))
24+
- \[ENH] Clarify definition of space entity [#2105](https://github.com/bids-standard/bids-specification/pull/2105) ([effigies](https://github.com/effigies))
25+
- \[ENH] Formalize presence of optional logs/ folder [#1962](https://github.com/bids-standard/bids-specification/pull/1962) ([yarikoptic](https://github.com/yarikoptic))
26+
- \[ENH] Add `matches` and `source_entity` to glossary and file templates [#1781](https://github.com/bids-standard/bids-specification/pull/1781) ([Remi-Gau](https://github.com/Remi-Gau))
27+
- \[ENH] Allow plus signs in labels [#1926](https://github.com/bids-standard/bids-specification/pull/1926) ([tsalo](https://github.com/tsalo))
28+
- \[ENH] Allow participants.tsv to contain a superset of subject directories and subjects listed in phenotype files [#2044](https://github.com/bids-standard/bids-specification/pull/2044) ([ericearl](https://github.com/ericearl))
29+
- \[ENH] Allow LICENSE files to have .txt, .md, or .rst extensions [#2036](https://github.com/bids-standard/bids-specification/pull/2036) ([monique2208](https://github.com/monique2208))
30+
- \[ENH] Render code blocks with language "tsv" as tables [#1794](https://github.com/bids-standard/bids-specification/pull/1794) ([effigies](https://github.com/effigies))
31+
- \[ENH] Do explicitly "allow" for having dotfiles and explicitly ignore them [#1992](https://github.com/bids-standard/bids-specification/pull/1992) ([yarikoptic](https://github.com/yarikoptic))
32+
- \[ENH] Add interpretation of "n/a" onsets in events.tsv files [#1966](https://github.com/bids-standard/bids-specification/pull/1966) ([Remi-Gau](https://github.com/Remi-Gau))
33+
- \[ENH] Update DWI suffixes to include most common scanner derivatives [#1864](https://github.com/bids-standard/bids-specification/pull/1864) ([Lestropie](https://github.com/Lestropie))
34+
- \[FIX] Update ResonantFrequency and SpectrometerFrequency to support both string/number and arrays [#2172](https://github.com/bids-standard/bids-specification/pull/2172) ([markmikkelsen](https://github.com/markmikkelsen))
35+
- \[FIX] Rescope or downgrade excess RECOMMENDED fields [#2116](https://github.com/bids-standard/bids-specification/pull/2116) ([effigies](https://github.com/effigies))
36+
- \[FIX] Remove incorrect DICOM correspondence of PartialFourier [#2128](https://github.com/bids-standard/bids-specification/pull/2128) ([effigies](https://github.com/effigies))
37+
- \[FIX] Re-align the text and the schema for filenames in derivatives [#1567](https://github.com/bids-standard/bids-specification/pull/1567) ([mguaypaq](https://github.com/mguaypaq))
38+
- \[FIX] Show example defaced derivative in a pipeline subdirectory [#2065](https://github.com/bids-standard/bids-specification/pull/2065) ([robertoostenveld](https://github.com/robertoostenveld))
39+
- \[FIX] Remove reference to dicm2nii and point to page with more converters [#2119](https://github.com/bids-standard/bids-specification/pull/2119) ([yarikoptic](https://github.com/yarikoptic))
40+
- \[FIX] Fix typos in specification about iEEG photo [#2091](https://github.com/bids-standard/bids-specification/pull/2091) ([qian-chu](https://github.com/qian-chu))
41+
- \[FIX] Allow (but discourage) task, acquisition and run entities for coordsystem.json and electrodes.tsv [#1888](https://github.com/bids-standard/bids-specification/pull/1888) ([effigies](https://github.com/effigies))
42+
343
## [v1.10.0](https://bids-specification.readthedocs.io/en/v1.10.0/) (2024-09-06)
444

545
- \[ENH] Add noRF and n/a ASL volume types [1884](https://github.com/bids-standard/bids-specification/pull/1884) ([tsalo](https://github.com/tsalo))

src/schema/BIDS_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.1-dev
1+
1.10.1

0 commit comments

Comments
 (0)