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

Add test to check that phys2bids output is BIDS compatible #362

Merged
merged 34 commits into from
Dec 4, 2020
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f9e3588
add test for the validator
vinferrer Dec 3, 2020
6439262
add bids_validate job to the workflow
vinferrer Dec 3, 2020
9edf33d
correct identation
vinferrer Dec 3, 2020
80324e3
try installing phys2bids from zero
vinferrer Dec 3, 2020
c2e06de
try to install python
vinferrer Dec 3, 2020
b35e99f
change container and try bids_validator install
vinferrer Dec 3, 2020
7d44a6a
add curl install
vinferrer Dec 3, 2020
18ebd27
eliminate command
vinferrer Dec 3, 2020
1ab4a8b
add bash command
vinferrer Dec 3, 2020
2fbaa35
do the phys2bids install in the test
vinferrer Dec 3, 2020
2f9cdc0
correct heur_tutorial path
vinferrer Dec 3, 2020
a9621b9
change testing file
vinferrer Dec 3, 2020
09cc294
correct copy command
vinferrer Dec 3, 2020
e3ee7da
tmp dir
vinferrer Dec 3, 2020
7fe1ed8
download heuristic
vinferrer Dec 3, 2020
b5f6df4
use wget instead of curl
vinferrer Dec 3, 2020
9f46731
add tree command
vinferrer Dec 3, 2020
5edb839
add tree install
vinferrer Dec 3, 2020
971679d
now bids_validate requires makeenv37
vinferrer Dec 3, 2020
474e918
delete pip command
vinferrer Dec 3, 2020
1246acb
do source at the beggining
vinferrer Dec 3, 2020
74e478b
go back to pip install
vinferrer Dec 3, 2020
8fa68f9
delete :
vinferrer Dec 3, 2020
1b149bc
add path:
vinferrer Dec 3, 2020
f4e0834
add path:
vinferrer Dec 3, 2020
51e063b
add unit test
vinferrer Dec 3, 2020
6ea8c16
forgot pip
vinferrer Dec 3, 2020
2c4b6bf
add my test badge
vinferrer Dec 3, 2020
e170dd6
add test badge
vinferrer Dec 3, 2020
023e442
add dummy bold file with corresponding json
vinferrer Dec 4, 2020
8b7a33f
now README doesn't have file extension, according to BIDS specification
vinferrer Dec 4, 2020
a16db51
delete root dir
vinferrer Dec 4, 2020
c85213f
undo commit
vinferrer Dec 4, 2020
8febea1
change path
vinferrer Dec 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
"bug",
"code",
"doc",
"review"
"review",
"test"
]
},
{
Expand Down
33 changes: 33 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,46 @@ jobs:
path: /tmp/src/coverage
- codecov/upload:
file: /tmp/src/coverage/coverage.xml

bids_validate:
docker:
- image: continuumio/miniconda3
working_directory: /tmp/src/phys2bids
steps:
- checkout
- restore_cache:
key: conda-py37-v1-{{ checksum "setup.cfg" }}
- run:
name: Generate enviroment
command: |
apt-get install -yqq curl wget tree
curl -sL https://deb.nodesource.com/setup_15.x | bash -
pip install -e ".[test]"
apt-get install -yqq nodejs
npm install -g bids-validator
- run:
name: dowload data and execute pipeline
command: |
wget -O Test1_multifreq_onescan.txt https://osf.io/7se4t/download
wget -O heur_test_multifreq.py https://osf.io/ehx6j/download
phys2bids -in Test1_multifreq_onescan.txt -chtrig 1 -ntp 30 -tr 1.2 -outdir physio_bids -heur heur_test_multifreq.py -sub 006 -ses 01
- run:
name: run_validator
command: |
tree physio_bids
bids-validator physio_bids
- persist_to_workspace:
root: /tmp
paths:
- src/coverage/.coverage.bids_37

workflows:
version: 2.1
build_test:
jobs:
- makeenv_37
- unittest_36
- bids_validate
- unittest_37:
requires:
- makeenv_37
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/CesarCaballeroGaudes"><img src="https://avatars1.githubusercontent.com/u/7611340?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cesar Caballero Gaudes</b></sub></a><br /><a href="#content-CesarCaballeroGaudes" title="Content">🖋</a> <a href="#data-CesarCaballeroGaudes" title="Data">🔣</a> <a href="#ideas-CesarCaballeroGaudes" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/vinferrer"><img src="https://avatars2.githubusercontent.com/u/38909338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vicente Ferrer</b></sub></a><br /><a href="https://github.com/physiopy/phys2bids/issues?q=author%3Avinferrer" title="Bug reports">🐛</a> <a href="https://github.com/physiopy/phys2bids/commits?author=vinferrer" title="Code">💻</a> <a href="https://github.com/physiopy/phys2bids/commits?author=vinferrer" title="Documentation">📖</a> <a href="https://github.com/physiopy/phys2bids/pulls?q=is%3Apr+reviewed-by%3Avinferrer" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="http://soichi.us"><img src="https://avatars3.githubusercontent.com/u/923896?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Soichi Hayashi</b></sub></a><br /><a href="https://github.com/physiopy/phys2bids/issues?q=author%3Asoichih" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/vinferrer"><img src="https://avatars2.githubusercontent.com/u/38909338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vicente Ferrer</b></sub></a><br /><a href="https://github.com/physiopy/phys2bids/issues?q=author%3Avinferrer" title="Bug reports">🐛</a> <a href="https://github.com/physiopy/phys2bids/commits?author=vinferrer" title="Code">💻</a> <a href="https://github.com/physiopy/phys2bids/commits?author=vinferrer" title="Documentation">📖</a> <a href="https://github.com/physiopy/phys2bids/pulls?q=is%3Apr+reviewed-by%3Avinferrer" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/physiopy/phys2bids/commits?author=vinferrer" title="Tests">⚠️</a></td>
<td align="center"><a href="http://soichi.us"><img src="https://avatars3.githubusercontent.com/u/923896?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Soichi Hayashi</b></sub></a><br /><a href="https://github.com/physiopy/phys2bids/issues?q=author%3Asoichih" title="Bug reports">🐛</a> </td>
<td align="center"><a href="https://github.com/sangfrois"><img src="https://avatars0.githubusercontent.com/u/38385719?v=4?s=100" width="100px;" alt=""/><br /><sub><b>François Lespinasse</b></sub></a><br /><a href="https://github.com/physiopy/phys2bids/commits?author=sangfrois" title="Code">💻</a> <a href="https://github.com/physiopy/phys2bids/commits?author=sangfrois" title="Tests">⚠️</a></td>
<td align="center"><a href="http://rossmarkello.com"><img src="https://avatars0.githubusercontent.com/u/14265705?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ross Markello</b></sub></a><br /><a href="https://github.com/physiopy/phys2bids/issues?q=author%3Armarkello" title="Bug reports">🐛</a> <a href="https://github.com/physiopy/phys2bids/commits?author=rmarkello" title="Code">💻</a> <a href="#content-rmarkello" title="Content">🖋</a> <a href="#ideas-rmarkello" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-rmarkello" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/physiopy/phys2bids/pulls?q=is%3Apr+reviewed-by%3Armarkello" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/physiopy/phys2bids/commits?author=rmarkello" title="Tests">⚠️</a></td>
</tr>
Expand Down