Skip to content

Commit 968d15d

Browse files
committed
Merge tag 'v0.5.4' into debian
heudiconv 0.5.4 * tag 'v0.5.4': (56 commits) rel: 0.5.4 bump: dcm2niix to latest release fix: avoid relative import in nipype node fix: remove print statement fix: minimize processing before batch submission fix: imports, outdated argument help fix: revert to explicit relative imports, use heudiconv executable for queue submissions fix: better support for queue args rf: move to absolute import ENH: manually fixed up already existing MD links to contain empty trailing [] Updated link_issues_CHANGELOG with new version from datalad 0.12.0rc2-125-gc350b96e fix: utils api link fix: batch example doc: finalize rtd doc: install all project dependencies on rtd fix: extension name doc: doc-building dependencies sty: whitespace + sphinx argparser sty+enh: try new style, add more content update dcm2niix to v1.0.20181125 ...
2 parents c147e79 + 17fdb9c commit 968d15d

38 files changed

+1163
-142
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<!-- DO NOT DELETE THIS!
2+
This template is used to facilitate issue resolution.
3+
All text in <!-> tags will not be displayed.
4+
-->
5+
16
### Summary
27
<!-- If you are having conversion troubles, please share as much
38
relevant information as possible. This includes, but is not limited to:
@@ -16,4 +21,4 @@ Choose one:
1621
<!-- If selected, please provide container name and tag"-->
1722

1823
- Heudiconv version:
19-
<!-- Command: heudiconv --version -->
24+
<!-- To check: run heudiconv with just the --version flag -->

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
.coverage
44
*.egg-info/
55
.idea/
6+
venvs/
7+
_build/

CHANGELOG.md

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,43 @@ All notable changes to this project will be documented (for humans) in this file
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [0.5.4] - 2019-04-29
8+
9+
This release includes fixes to BIDS multi-echo conversions, the
10+
re-implementation of queuing support (currently just SLURM), as well as
11+
some bugfixes.
12+
13+
Starting today, we will (finally) push versioned releases to DockerHub.
14+
Finally, to more accurately reflect on-going development, the `latest`
15+
tag has been renamed to `unstable`.
16+
17+
### Added
18+
- Readthedocs documentation ([#327][])
19+
20+
### Changed
21+
- Update Docker dcm2niix to v.1.0.20190410 ([#334][])
22+
- Allow usage of `--files` with basic heuristics. This requires
23+
use of `--subject` flag, and is limited to one subject. ([#293][])
24+
25+
### Deprecated
26+
27+
### Fixed
28+
- Improve support for multiple `--queue-args` ([#328][])
29+
- Fixed an issue where generated BIDS sidecar files were missing additional
30+
information - treating all conversions as if the `--minmeta` flag was
31+
used ([#306][])
32+
- Re-enable SLURM queuing support ([#304][])
33+
- BIDS multi-echo support for EPI + T1 images ([#293][])
34+
- Correctly handle the case when `outtype` of heuristic has "dicom"
35+
before '.nii.gz'. Previously would have lead to absent additional metadata
36+
extraction etc ([#310][])
37+
38+
### Removed
39+
- `--sbargs` argument was renamed to `--queue-args` ([#304][])
40+
41+
### Security
42+
43+
744
## [0.5.3] - 2019-01-12
845

946
Minor hot bugfix release
@@ -101,28 +138,28 @@ The first release after major refactoring:
101138
- Many other various issues
102139

103140
## [0.4] - 2017-10-15
104-
A usable release to support [DBIC] use-case
141+
A usable release to support [DBIC][] use-case
105142
### Added
106143
- more testing
107144
### Changes
108-
- Dockerfile updates (added pigz, progressed forward [dcm2niix])
145+
- Dockerfile updates (added pigz, progressed forward [dcm2niix][])
109146
### Fixed
110147
- correct date/time in BIDS `_scans` files
111148
- sort entries in `_scans` by date and then filename
112149

113150
## [0.3] - 2017-07-10
114-
A somewhat working release on the way to support [DBIC] use-case
151+
A somewhat working release on the way to support [DBIC][] use-case
115152
### Added
116153
- more tests
117154
- groupping of dicoms by series if provided
118155
- many more features and fixes
119156

120157
## [0.2] - 2016-10-20
121-
An initial release on the way to support [DBIC] use-case
158+
An initial release on the way to support [DBIC][] use-case
122159
### Added
123160
- basic Python project assets (`setup.py`, etc)
124161
- basic tests
125-
- [datalad] support
162+
- [datalad][] support
126163
- dbic_bids heuristic
127164
- `--dbg` command line flag to enter `pdb` environment upon failure
128165
## Fixed
@@ -152,3 +189,8 @@ TODO Summary
152189
[DBIC]: http://dbic.dartmouth.edu
153190
[datalad]: http://datalad.org
154191
[dcm2niix]: https://github.com/rordenlab/dcm2niix
192+
[#293]: https://github.com/nipy/heudiconv/issues/293
193+
[#301]: https://github.com/nipy/heudiconv/issues/301
194+
[#304]: https://github.com/nipy/heudiconv/issues/304
195+
[#306]: https://github.com/nipy/heudiconv/issues/306
196+
[#310]: https://github.com/nipy/heudiconv/issues/310

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN export ND_ENTRYPOINT="/neurodocker/startup.sh" \
3939

4040
ENTRYPOINT ["/neurodocker/startup.sh"]
4141

42-
ENV PATH="/opt/dcm2niix-v1.0.20180622/bin:$PATH"
42+
ENV PATH="/opt/dcm2niix-v1.0.20190410/bin:$PATH"
4343
RUN apt-get update -qq \
4444
&& apt-get install -y -q --no-install-recommends \
4545
cmake \
@@ -54,10 +54,10 @@ RUN apt-get update -qq \
5454
&& git clone https://github.com/rordenlab/dcm2niix /tmp/dcm2niix \
5555
&& cd /tmp/dcm2niix \
5656
&& git fetch --tags \
57-
&& git checkout v1.0.20180622 \
57+
&& git checkout v1.0.20190410 \
5858
&& mkdir /tmp/dcm2niix/build \
5959
&& cd /tmp/dcm2niix/build \
60-
&& cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/dcm2niix-v1.0.20180622 .. \
60+
&& cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/dcm2niix-v1.0.20190410 .. \
6161
&& make \
6262
&& make install \
6363
&& rm -rf /tmp/dcm2niix
@@ -115,7 +115,7 @@ RUN echo '{ \
115115
\n [ \
116116
\n "dcm2niix", \
117117
\n { \
118-
\n "version": "v1.0.20180622", \
118+
\n "version": "v1.0.20190410", \
119119
\n "method": "source" \
120120
\n } \
121121
\n ], \

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ dicomstack.
7676

7777
- YouTube:
7878
- ["Heudiconv Example"](https://www.youtube.com/watch?v=O1kZAuR7E00) by [James Kent](https://github.com/jdkent)
79+
- Blog post:
80+
- ["BIDS Tutorial Series: HeuDiConv Walkthrough"](http://reproducibility.stanford.edu/bids-tutorial-series-part-2a/) by the [Stanford Center for Reproducible Neuroscience](http://reproducibility.stanford.edu/)
7981

8082
## How it works (in some more detail)
8183

README.rst

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
=============
2+
**HeuDiConv**
3+
=============
4+
5+
`a heuristic-centric DICOM converter`
6+
7+
.. image:: https://img.shields.io/badge/docker-nipy/heudiconv:unstable-brightgreen.svg?logo=docker&style=flat
8+
:target: https://hub.docker.com/r/nipy/heudiconv/tags/
9+
:alt: Our Docker image
10+
11+
.. image:: https://travis-ci.org/nipy/heudiconv.svg?branch=master
12+
:target: https://travis-ci.org/nipy/heudiconv
13+
:alt: TravisCI
14+
15+
.. image:: https://codecov.io/gh/nipy/heudiconv/branch/master/graph/badge.svg
16+
:target: https://codecov.io/gh/nipy/heudiconv
17+
:alt: CodeCoverage
18+
19+
.. image:: https://readthedocs.org/projects/heudiconv/badge/?version=latest
20+
:target: http://heudiconv.readthedocs.io/en/latest/?badge=latest
21+
:alt: Readthedocs
22+
23+
About
24+
-----
25+
26+
``heudiconv`` is a flexible DICOM converter for organizing brain imaging data
27+
into structured directory layouts.
28+
29+
- it allows flexible directory layouts and naming schemes through customizable heuristics implementations
30+
- it only converts the necessary DICOMs, not everything in a directory
31+
- you can keep links to DICOM files in the participant layout
32+
- using dcm2niix under the hood, it's fast
33+
- it can track the provenance of the conversion from DICOM to NIfTI in W3C PROV format
34+
- it provides assistance in converting to `BIDS <http://bids.neuroimaging.io/>`_.
35+
- it integrates with `DataLad <https://www.datalad.org/>`_ to place converted and original data under git/git-annex version control, while automatically annotating files with sensitive information (e.g., non-defaced anatomicals, etc)

docs/Makefile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line.
5+
SPHINXOPTS =
6+
SPHINXBUILD = sphinx-build
7+
SOURCEDIR = .
8+
BUILDDIR = _build
9+
10+
# Put it first so that "make" without argument is like "make help".
11+
help:
12+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
13+
14+
.PHONY: help Makefile
15+
16+
# Catch-all target: route all unknown targets to Sphinx using the new
17+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
18+
%: Makefile
19+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/api.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
=============
2+
API Reference
3+
=============
4+
5+
.. toctree::
6+
:maxdepth: 1
7+
8+
api/bids
9+
api/convert
10+
api/dicoms
11+
api/parser
12+
api/queue
13+
api/utils

docs/api/bids.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
====
2+
BIDS
3+
====
4+
5+
.. automodule:: heudiconv.bids

docs/api/convert.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
==========
2+
Conversion
3+
==========
4+
5+
.. automodule:: heudiconv.convert

0 commit comments

Comments
 (0)