Skip to content

Commit 880e7e6

Browse files
committed
just stash
1 parent 5cbeaf7 commit 880e7e6

File tree

11 files changed

+53
-42
lines changed

11 files changed

+53
-42
lines changed

.projectignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# project-local contains your personal configuration choices and state
2+
/anaconda-project-local.yml
3+
4+
# Files autocreated by Python
5+
__pycache__/
6+
*.pyc
7+
*.pyo
8+
*.pyd
9+
10+
# Notebook stuff
11+
/.ipynb_checkpoints
12+
13+
# Spyder stuff
14+
/.spyderproject

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN apt-get update -qq \
7171
libc-dev \
7272
git-annex-standalone \
7373
netbase \
74+
vim \
7475
&& apt-get clean \
7576
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
7677

environment27.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/annex/objects/SHA256E-s3151--0270335bbbc9ae6db51a923b92854401449661dac8a9c98d25ed37466b3af141.yml

heudiconv/cli/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from ..utils import load_heuristic, anonymize_sid, treat_infofile, SeqInfo
99
from ..convert import prep_conversion
1010
from ..bids import populate_bids_templates, tuneup_bids_json_files
11-
from ..queue import queue_conversion
11+
from ..slurmqueue import queue_conversion
1212

1313
import inspect
1414
import logging

heudiconv/queue.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

heudiconv/slurmqueue.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/annex/objects/SHA256E-s1164--c0074611d4178ba7bf603159c93e65f7ee7aa7c2c339a30098a9cd7e20db4547.py

heudiconv/tests/data/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/annex/objects/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.py
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/annex/objects/SHA256E-s391--38015958888dd40f9c1872ee36a5a02587f010e0b2946be8ecd2f23c4970b07d.py

heudiconv/tests/test_regression.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@
1919

2020
@pytest.mark.parametrize('subject', ['sub-sid000143'])
2121
@pytest.mark.parametrize('heuristic', ['reproin.py'])
22+
@pytest.mark.parametrize('anon_cmd', [None]) # ['anonymize_script.py']
2223
@pytest.mark.skipif(not have_datalad, reason="no datalad")
23-
def test_conversion(tmpdir, subject, heuristic):
24+
def test_conversion(tmpdir, subject, heuristic, anon_cmd):
2425
tmpdir.chdir()
2526
try:
2627
datadir = fetch_data(tmpdir.strpath, subject)
2728
except IncompleteResultsError as exc:
2829
pytest.skip("Failed to fetch test data: %s" % str(exc))
2930
outdir = tmpdir.mkdir('out').strpath
3031

31-
args = gen_heudiconv_args(datadir, outdir, subject, heuristic)
32+
args = gen_heudiconv_args(datadir, outdir, subject, heuristic, anon_cmd)
3233
runner(args) # run conversion
3334

3435
# verify functionals were converted

heudiconv/tests/utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@
55
TESTS_DATA_PATH = op.join(op.dirname(__file__), 'data')
66

77

8-
def gen_heudiconv_args(datadir, outdir, subject, heuristic_file, xargs=None):
8+
def gen_heudiconv_args(datadir, outdir, subject, heuristic_file, anon_cmd=None, xargs=None):
99
heuristic = op.realpath(op.join(HEURISTICS_PATH, heuristic_file))
1010
args = ["-d", op.join(datadir, 'sourcedata/{subject}/*/*/*.tgz'),
1111
"-c", "dcm2niix",
1212
"-o", outdir,
1313
"-s", subject,
1414
"-f", heuristic,
1515
"--bids",]
16+
if anon_cmd:
17+
args += ["--anon-cmd", op.join(op.dirname(__file__), 'data', anon_cmd), "-a", outdir]
1618
if xargs:
1719
args += xargs
20+
21+
print("DEBUGCUSTOM1")
22+
print(args)
1823

1924
return args
2025

0 commit comments

Comments
 (0)