Skip to content

Commit d76569b

Browse files
Merge branch 'bids-standard:master' into master
2 parents b29c082 + 1235e5b commit d76569b

File tree

8 files changed

+21
-11
lines changed

8 files changed

+21
-11
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
- id: check-readthedocs
2626
files: readthedocs.yml
2727
- repo: https://github.com/psf/black
28-
rev: 24.4.2
28+
rev: 24.8.0
2929
hooks:
3030
- id: black
3131
files: ^tools/(?!schemacode)
@@ -45,7 +45,7 @@ repos:
4545
files: tools/schemacode
4646
args: ["--settings-file", "tools/schemacode/pyproject.toml"]
4747
- repo: https://github.com/pyCQA/flake8
48-
rev: 7.1.0
48+
rev: 7.1.1
4949
hooks:
5050
- id: flake8
5151
args: [--config=tools/schemacode/setup.cfg]
@@ -67,7 +67,7 @@ repos:
6767
- id: codespell
6868
args: ["--config=.codespellrc", "--dictionary=-", "--dictionary=.codespell_dict"]
6969
- repo: https://github.com/pre-commit/mirrors-mypy
70-
rev: v1.11.0
70+
rev: v1.11.1
7171
hooks:
7272
- id: mypy
7373
# Sync with project.optional-dependencies.typing

src/modality-specific-files/magnetic-resonance-imaging-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ within the `[*_]dwi.bval` and `[*_]dwi.bvec` files) MAY change across DWI runs.
721721

722722
**Gradient orientation file formats**.
723723
The `[*_]dwi.bval` and `[*_]dwi.bvec` files MUST follow the
724-
[FSL format](https://fsl.fmrib.ox.ac.uk/fsl/fslwiki/FDT/UserGuide#DTIFIT):
724+
[FSL format](https://fsl.fmrib.ox.ac.uk/fsl/docs/#/diffusion/index?id=diffusion-data-in-fsl):
725725
The `[*_]dwi.bvec` file contains 3 rows with *N* space-delimited floating-point numbers
726726
(corresponding to the *N* volumes in the corresponding NIfTI file.)
727727
The first row contains the *x* elements, the second row contains the *y* elements and

src/modality-specific-files/microscopy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Microscopy raw data MUST be stored in one of the following formats:
5555

5656
- [OME-TIFF](https://docs.openmicroscopy.org/ome-model/6.1.2/ome-tiff/specification.html#)
5757
(`.ome.tif` for standard TIFF files or `.ome.btf` for
58-
[BigTIFF](https://www.awaresystems.be/imaging/tiff/bigtiff.html) files)
58+
[BigTIFF](https://web.archive.org/web/20240706160214/https://www.awaresystems.be/imaging/tiff/bigtiff.html) files)
5959

6060
- [OME-ZARR/NGFF](https://ngff.openmicroscopy.org/latest/) (`.ome.zarr` directories)
6161

src/schema/SCHEMA_VERSION

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

src/schema/meta/context.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ properties:
2929
dataset_description:
3030
description: 'Contents of /dataset_description.json'
3131
type: object
32-
files:
33-
description: 'List of all files in dataset'
34-
type: array
3532
tree:
3633
description: 'Tree view of all files in dataset'
3734
type: object

src/schema/rules/checks/dataset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SamplesTSVMissing:
5151
- path == '/dataset_description.json'
5252
- '"micr" in dataset.modalities'
5353
checks:
54-
- "'samples.tsv' in dataset.files"
54+
- exists('samples.tsv', 'dataset')
5555

5656
UnknownVersion:
5757
issue:

src/schema/rules/checks/hints.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@ TooFewAuthors:
3434
checks:
3535
- length(json.Authors) > 1
3636

37+
# 115
38+
EmptyDatasetName:
39+
issue:
40+
code: EMPTY_DATASET_NAME
41+
message: |
42+
The Name field of dataset_description.json is present but empty of visible characters.
43+
level: warning
44+
selectors:
45+
- path == '/dataset_description.json'
46+
- type(json.Name) != 'null'
47+
checks:
48+
- match(json.Name, '\S')
49+
3750
### Functional files
3851

3952
# 85

src/schema/rules/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ derivative_description:
3434
dataset_description_with_genetics:
3535
selectors:
3636
- path == "/dataset_description.json"
37-
- intersects(dataset.files, ["/genetic_info.json"])
37+
- exists('genetic_info.json', 'dataset')
3838
fields:
3939
Genetics: required
4040

0 commit comments

Comments
 (0)