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

[MAINT] Update bep009 from master #756

Merged
merged 12 commits into from
Mar 15, 2021

Conversation

tsalo
Copy link
Member

@tsalo tsalo commented Mar 15, 2021

This addresses the merge conflict for one table.

adam2392 and others added 8 commits March 3, 2021 10:07
…ids-standard#738)

* Adding clarification.

* Fix clarifications.

* Fix link.

* Apply suggestions from code review

Co-authored-by: Stefan Appelhoff <stefan.appelhoff@mailbox.org>

* Add link back.

* Update src/06-longitudinal-and-multi-site-studies.md

* Apply suggestions from code review

Co-authored-by: Taylor Salo <tsalo006@fiu.edu>

* Update src/06-longitudinal-and-multi-site-studies.md

Co-authored-by: Taylor Salo <tsalo006@fiu.edu>

* Fix docs.

* line breaks

Co-authored-by: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Co-authored-by: Taylor Salo <tsalo006@fiu.edu>
…nels+electrodes do not have to match (bids-standard#734)

* clarify that label of _space-<label> must be from appendix VIII

related to https://github.com/bids-standard/bids-validator/issues/743

* clarify that channels and electrodes do not have to match

closes bids-standard#667

* catch typo again

* link channels+electrodes examples

* clarify _where_ restricted keywords for space entity come from

* fix typo L -> l (capitalization)

Co-authored-by: Chris Markiewicz <effigies@gmail.com>

* extend yml lint limit to 120 chard

* use existing .yamllint.yml file

Co-authored-by: Chris Markiewicz <effigies@gmail.com>
* update mkdocs install instructions

* add hard and soft style guide rules to CONTRIBUTING

* fix json string example formatting

* fix typos, word wrapping, abbreviations

* Apply suggestions from code review

Co-authored-by: Stefan Appelhoff <stefan.appelhoff@mailbox.org>

* Update src/04-modality-specific-files/04-intracranial-electroencephalography.md

Co-authored-by: Stefan Appelhoff <stefan.appelhoff@mailbox.org>

* Apply suggestions from code review

Thanks for these Taylor

Co-authored-by: Taylor Salo <tsalo006@fiu.edu>

* Apply suggestions from code review

Co-authored-by: Stefan Appelhoff <stefan.appelhoff@mailbox.org>

* reformat string examples from merged ASL section

* apply linter on raw spec files

* pacify the linter gods

Co-authored-by: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Co-authored-by: Taylor Salo <tsalo006@fiu.edu>
* bump nodejs in markdown check CI

* explicitly point to .remarkrc from remark CI

* bump npm package versions for remark

* try global install

* try exporting node path

* back to using local install

* ignore npm package.json package-lock.json, and node_modules

* remove unnecessary words

* fix list space indents

* streamline remark flow in .circleci

* cleanup code

* indentations in yml

* indentation once more

* amend CONTRIBUTING to use npx

* setup_remote_docker indentation?

* persist to workspace indentation

* indent fixes

* remove prettier file and mention of it in contrib guide

* add remark-lint-list-item-indent to requirements list

needed to run locally

* fix minor issues with remark

* add note to be careful when using remark

Co-authored-by: Remi Gau <remi_gau@hotmail.com>

Co-authored-by: Remi Gau <remi_gau@hotmail.com>
[FIX] Mix up (typo) between ficiduals and landmarks in EEG spec
@tsalo tsalo changed the title [MAINT] Update from master [MAINT] Update bep009 from master Mar 15, 2021
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. Any notion why the linter is suddenly complaining about this?

src/04-modality-specific-files/09-positron-emission-tomography.md
  95:5  warning  Incorrect list-item indent: add 2 spaces  list-item-indent  remark-lint
  96:5  warning  Incorrect list-item indent: add 2 spaces  list-item-indent  remark-lint
  97:5  warning  Incorrect list-item indent: add 2 spaces  list-item-indent  remark-lint
  98:5  warning  Incorrect list-item indent: add 2 spaces  list-item-indent  remark-lint

@tsalo
Copy link
Member Author

tsalo commented Mar 15, 2021

I was wondering about that... I think there was a recent PR that changed the remark settings. Maybe that's it?

I can fix the issues in this PR if that's alright.

@sappelhoff
Copy link
Member

LGTM. Any notion why the linter is suddenly complaining about this?

I updated the packages in #745 so that may have to do with it. just like #755

@tsalo tsalo merged commit d7acc72 into bids-standard:bep-009 Mar 15, 2021
@tsalo tsalo deleted the update-from-master branch March 15, 2021 16:38
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