Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Move _stim.<ext> specification within the Task Events module #1750

Merged
merged 16 commits into from
Apr 11, 2024

Conversation

oesteban
Copy link
Collaborator

@oesteban oesteban commented Mar 25, 2024

This fix builds on #1749 to separate _stim and _physio in the specs.

Currently _stim files are specified sideways as an addon or extra branch of _physio, which can be confusing and misrepresent their intent.

Moving them with the other stimuli definitions increases the consistency of the spec and the findability of _stim specifications.

This fix requires #1749 for a more consistent prescription of tsv.gz files.

@oesteban oesteban force-pushed the fix/stim-files-with-stimuli branch from c004c7a to efe5c2a Compare March 25, 2024 10:41
@oesteban oesteban mentioned this pull request Mar 25, 2024
9 tasks
@oesteban oesteban force-pushed the fix/stim-files-with-stimuli branch 3 times, most recently from 27d13ad to 667e373 Compare March 25, 2024 15:13
src/common-principles.md Outdated Show resolved Hide resolved
@sappelhoff
Copy link
Member

This fix builds on #1748 to separate _stim and _physio in the specs.

did you mean to reference:

Copy link
Member

@sappelhoff sappelhoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently _stim files are specified sideways as an addon or extra branch of _physio, which can be confusing and misrepresent their intent.

Moving them with the other stimuli definitions increases the consistency of the spec and the findability of _stim specifications.

agreed!

Let's fix up #1749 first and then get this one ready!

@oesteban oesteban force-pushed the fix/stim-files-with-stimuli branch from 5054e2d to 78ea018 Compare March 27, 2024 13:00
@oesteban
Copy link
Collaborator Author

Since #1749 is looking very close to the finish line, the following link oesteban/bids-specification@fix/large-tabular-files...oesteban:bids-specification:fix/stim-files-with-stimuli can be used to look at the changes specific of this PR without distractions.

Copy link
Collaborator

@effigies effigies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Small comments.

Copy link
Member

@tsalo tsalo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just have one small concern/question about inheritance with .tsv.gz files.

src/common-principles.md Outdated Show resolved Hide resolved
src/common-principles.md Outdated Show resolved Hide resolved
Copy link

codecov bot commented Apr 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.93%. Comparing base (dbcb237) to head (cd9c926).

❗ Current head cd9c926 differs from pull request most recent head 00114cc. Consider uploading reports for the commit 00114cc to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1750   +/-   ##
=======================================
  Coverage   87.93%   87.93%           
=======================================
  Files          16       16           
  Lines        1351     1351           
=======================================
  Hits         1188     1188           
  Misses        163      163           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@oesteban oesteban requested a review from Remi-Gau April 2, 2024 09:21
@Remi-Gau
Copy link
Collaborator

Remi-Gau commented Apr 2, 2024

I introduced a merged conflict. Will fix.

@oesteban
Copy link
Collaborator Author

oesteban commented Apr 2, 2024

I introduced a merged conflict. Will fix.

I can take care, will be faster

EDIT - fixed!

@oesteban oesteban force-pushed the fix/stim-files-with-stimuli branch from fb8dd81 to 5a4f292 Compare April 2, 2024 12:42
Copy link
Collaborator

@Remi-Gau Remi-Gau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good with me

@oesteban
Copy link
Collaborator Author

oesteban commented Apr 2, 2024

Good with me

What should we do about the admonition linting? I haven't managed to ignore them or making the plugin work.

@oesteban
Copy link
Collaborator Author

oesteban commented Apr 2, 2024

Perhaps moving them inside the admonition?

@oesteban oesteban force-pushed the fix/stim-files-with-stimuli branch from 07a34f0 to cad7b48 Compare April 2, 2024 15:12
@oesteban
Copy link
Collaborator Author

oesteban commented Apr 2, 2024

Perhaps moving them inside the admonition?

That actually did the trick!

Copy link
Member

@sappelhoff sappelhoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with the changes here in principle, pending this review item:

it'd be important that the reference to an example points at a valid example

src/modality-specific-files/task-events.md Outdated Show resolved Hide resolved
src/modality-specific-files/task-events.md Outdated Show resolved Hide resolved
src/modality-specific-files/task-events.md Outdated Show resolved Hide resolved
src/modality-specific-files/task-events.md Outdated Show resolved Hide resolved
@Remi-Gau
Copy link
Collaborator

Remi-Gau commented Apr 3, 2024

I think this should be ready to merge after the 5 days period.

@Remi-Gau
Copy link
Collaborator

Remi-Gau commented Apr 3, 2024

I agree with the changes here in principle, pending this review item:

* https://github.com/bids-standard/bids-specification/pull/1750/files#r1548105139

it'd be important that the reference to an example points at a valid example

BTW: did a quick check on openneuro via the datalad superdataset and I could not find a dataset with stim files except the one that @oesteban had mentioned.

@oesteban
Copy link
Collaborator Author

@Remi-Gau @sappelhoff @effigies - may I merge this? I'd like to rebase BEP020, which will benefit substantially from getting stim out of physio.

@effigies effigies merged commit 943c20e into bids-standard:master Apr 11, 2024
23 of 24 checks passed
yarikoptic added a commit to yarikoptic/bids-specification that referenced this pull request Apr 13, 2024
* origin/master: (278 commits)
  [FIX] Move ``_stim.<ext>`` specification within the Task Events module (bids-standard#1750)
  rm macros with missing metadata
  Update src/schema/objects/metadata.yaml
  Update src/schema/objects/metadata.yaml
  Update src/schema/objects/metadata.yaml
  [pre-commit.ci] pre-commit autoupdate
  Update src/common-principles.md
  Update src/common-principles.md
  Update src/common-principles.md
  Update src/common-principles.md
  fix: replace SHOULD with MUST in last changes (cc @effigies)
  Apply suggestions from code review
  Apply suggestions from code review
  Apply suggestions from code review
  fix: checking if chinese characters are accepted by pandoc
  Apply suggestions from code review
  Update src/common-principles.md
  Update src/schema/rules/checks/events.yaml
  fix: deduplicate prescriptions for columns in tsvgz
  Apply suggestions from code review
  ...

 Conflicts:
	mkdocs.yml - just redid changes found in prior diff but unifying for current indentation and use of ""
@sappelhoff sappelhoff changed the title FIX: Move _stim.<ext> specification within the Task Events module [FIX] Move _stim.<ext> specification within the Task Events module Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants