Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
effigies committed Oct 15, 2023
2 parents 51319bb + 61a7d98 commit 87fc8b1
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 27 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Set update schedule for GitHub Actions

version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
6 changes: 3 additions & 3 deletions .github/workflows/contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
python-version: [3]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand All @@ -54,6 +54,6 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Codespell
uses: codespell-project/actions-codespell@v1
uses: codespell-project/actions-codespell@v2
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
OS_TYPE: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
OS_TYPE: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ repeatability problems of the CompCor implementation.
<https://www.nipreps.org/devs/releases/#long-term-support-series>`__.
This LTS version will be kindly steered and maintained by
the group of Dr. Basile Pinsard and Prof. Pierre Bellec at
`CRIUGM <http://www.criugm.qc.ca/>`__, (Université de Montréal).
`CRIUGM <https://criugm.qc.ca/>`__, (Université de Montréal).
The LTS is planned for a window of 4 years of support (i.e., until
September 2024).

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ task-based and resting-state functional MRI (fMRI).
:target: https://circleci.com/gh/nipreps/fmriprep/tree/master

.. image:: https://readthedocs.org/projects/fmriprep/badge/?version=latest
:target: http://fmriprep.readthedocs.io/en/latest/?badge=latest
:target: https://fmriprep.org/en/latest/?badge=latest
:alt: Documentation Status

.. image:: https://img.shields.io/pypi/v/fmriprep.svg
Expand Down
2 changes: 1 addition & 1 deletion REFERENCES.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
| DVARS | https://arxiv.org/abs/1704.01469 https://doi.org/10.1101/125021 | https://nipype.readthedocs.io/en/latest/interfaces/generated/nipype.algorithms.confounds.html#computedvars |
| Framewise displacement | | https://nipype.readthedocs.io/en/latest/interfaces/generated/nipype.algorithms.confounds.html#framewisedisplacement |
| **Other**
| a/tCompCor | https://doi.org/10.1016/j.neuroimage.2007.04.042 | http://nipype.readthedocs.io/en/latest/interfaces/generated/nipype.algorithms.confounds.html#compcor |
| a/tCompCor | https://doi.org/10.1016/j.neuroimage.2007.04.042 | https://nipype.readthedocs.io/en/latest/api/generated/nipype.algorithms.confounds.html#nipype-algorithms-confounds-compcor |
| Connectome Workbench | | https://humanconnectome.org/software/connectome-workbench
| phdiff2fmap | https://doi.org/10.1006/nimg.2001.1054 | https://fmriprep.readthedocs.io/en/stable/sdc/estimation.html#fmriprep.interfaces.fmap.phdiff2fmap |
| nibabel | https://doi.org/10.5281/zenodo.60808 | https://github.com/nipy/nibabel/ |
Expand Down
2 changes: 1 addition & 1 deletion docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Troubleshooting
Logs and crashfiles are output into the
``<output dir>/fmriprep/sub-<participant_label>/log`` directory.
Information on how to customize and understand these files can be found on the
`Debugging Nipype Workflows <http://nipype.readthedocs.io/en/latest/users/debug.html>`_
`Debugging Nipype Workflows <https://miykael.github.io/nipype_tutorial/notebooks/basic_debug.html>`_
page.

**Support and communication**.
Expand Down
28 changes: 14 additions & 14 deletions fmriprep/data/boilerplate.bib
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ @article{fs_reconall
pages = {179-194},
shorttitle = {Cortical Surface-Based Analysis},
title = {Cortical Surface-Based Analysis: I. Segmentation and Surface Reconstruction},
url = {http://www.sciencedirect.com/science/article/pii/S1053811998903950},
url = {https://www.sciencedirect.com/science/article/pii/S1053811998903950},
volume = 9,
year = 1999
}
Expand All @@ -84,7 +84,7 @@ @article{mindboggle
number = 2,
pages = {e1005350},
title = {Mindboggling morphometry of human brains},
url = {http://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1005350},
url = {https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1005350},
volume = 13,
year = 2017
}
Expand Down Expand Up @@ -132,7 +132,7 @@ @article{ants
pages = {26-41},
shorttitle = {Symmetric diffeomorphic image registration with cross-correlation},
title = {Symmetric diffeomorphic image registration with cross-correlation: Evaluating automated labeling of elderly and neurodegenerative brain},
url = {http://www.sciencedirect.com/science/article/pii/S1361841507000606},
url = {https://www.sciencedirect.com/science/article/pii/S1361841507000606},
volume = 12,
year = 2008
}
Expand All @@ -157,7 +157,7 @@ @article{fieldmapless1
journal = {Frontiers in Neuroinformatics},
language = {English},
title = {Evaluation of Field Map and Nonlinear Registration Methods for Correction of Susceptibility Artifacts in Diffusion {MRI}},
url = {http://journal.frontiersin.org/article/10.3389/fninf.2017.00017/full},
url = {https://www.frontiersin.org/articles/10.3389/fninf.2017.00017/full},
volume = 11,
year = 2017
}
Expand All @@ -169,7 +169,7 @@ @phdthesis{fieldmapless2
school = {Freie Universität},
title = {Evaluating nonlinear coregistration of {BOLD} {EPI} and T1w images},
type = {Master's Thesis},
url = {http://hdl.handle.net/11858/00-001M-0000-002B-1CB5-A},
url = {https://hdl.handle.net/11858/00-001M-0000-002B-1CB5-A},
year = 2014
}

Expand All @@ -181,7 +181,7 @@ @article{fieldmapless3
number = 3,
pages = {e0152472},
title = {Characterization and Correction of Geometric Distortions in 814 Diffusion Weighted Images},
url = {http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0152472},
url = {https://journals.plos.org/plosone/article?id=10.1371/journal.pone.0152472},
volume = 11,
year = 2016
}
Expand All @@ -190,7 +190,7 @@ @article{flirt
title = {A global optimisation method for robust affine registration of brain images},
volume = {5},
issn = {1361-8415},
url = {http://www.sciencedirect.com/science/article/pii/S1361841501000366},
url = {https://www.sciencedirect.com/science/article/pii/S1361841501000366},
doi = {10.1016/S1361-8415(01)00036-6},
number = {2},
urldate = {2018-07-27},
Expand All @@ -209,7 +209,7 @@ @article{mcflirt
number = 2,
pages = {825-841},
title = {Improved Optimization for the Robust and Accurate Linear Registration and Motion Correction of Brain Images},
url = {http://www.sciencedirect.com/science/article/pii/S1053811902911328},
url = {https://www.sciencedirect.com/science/article/pii/S1053811902911328},
volume = 17,
year = 2002
}
Expand All @@ -234,7 +234,7 @@ @article{power_fd_dvars
number = {Supplement C},
pages = {320-341},
title = {Methods to detect, characterize, and remove motion artifact in resting state fMRI},
url = {http://www.sciencedirect.com/science/article/pii/S1053811913009117},
url = {https://www.sciencedirect.com/science/article/pii/S1053811913009117},
volume = 84,
year = 2014
}
Expand All @@ -247,7 +247,7 @@ @article{confounds_satterthwaite_2013
number = 1,
pages = {240--256},
title = {{An improved framework for confound regression and filtering for control of motion artifact in the preprocessing of resting-state functional connectivity data}},
url = {http://linkinghub.elsevier.com/retrieve/pii/S1053811912008609},
url = {https://www.sciencedirect.com/science/article/pii/S1053811912008609},
volume = 64,
year = 2013
}
Expand All @@ -273,7 +273,7 @@ @article{lanczos
number = 1,
pages = {76-85},
title = {Evaluation of Noisy Data},
url = {http://epubs.siam.org/doi/10.1137/0701007},
url = {https://epubs.siam.org/doi/10.1137/0701007},
volume = 1,
year = 1964
}
Expand All @@ -286,7 +286,7 @@ @article{compcor
number = 1,
pages = {90-101},
title = {A component based noise correction method ({CompCor}) for {BOLD} and perfusion based fMRI},
url = {http://www.sciencedirect.com/science/article/pii/S1053811907003837},
url = {https://www.sciencedirect.com/science/article/pii/S1053811907003837},
volume = 37,
year = 2007
}
Expand All @@ -299,7 +299,7 @@ @article{hcppipelines
pages = {105-124},
series = {Mapping the Connectome},
title = {The minimal preprocessing pipelines for the Human Connectome Project},
url = {http://www.sciencedirect.com/science/article/pii/S1053811913005053},
url = {https://www.sciencedirect.com/science/article/pii/S1053811913005053},
volume = 80,
year = 2013
}
Expand Down Expand Up @@ -354,7 +354,7 @@ @article{patriat_improved_2017
title = {An improved model of motion-related signal changes in {fMRI}},
volume = {144, Part A},
issn = {1053-8119},
url = {http://www.sciencedirect.com/science/article/pii/S1053811916304360},
url = {https://www.sciencedirect.com/science/article/pii/S1053811916304360},
doi = {10.1016/j.neuroimage.2016.08.051},
abstract = {Head motion is a significant source of noise in the estimation of functional connectivity from resting-state functional MRI (rs-fMRI). Current strategies to reduce this noise include image realignment, censoring time points corrupted by motion, and including motion realignment parameters and their derivatives as additional nuisance regressors in the general linear model. However, this nuisance regression approach assumes that the motion-induced signal changes are linearly related to the estimated realignment parameters, which is not always the case. In this study we develop an improved model of motion-related signal changes, where nuisance regressors are formed by first rotating and translating a single brain volume according to the estimated motion, re-registering the data, and then performing a principal components analysis (PCA) on the resultant time series of both moved and re-registered data. We show that these “Motion Simulated (MotSim)” regressors account for significantly greater fraction of variance, result in higher temporal signal-to-noise, and lead to functional connectivity estimates that are less affected by motion compared to the most common current approach of using the realignment parameters and their derivatives as nuisance regressors. This improvement should lead to more accurate estimates of functional connectivity, particularly in populations where motion is prevalent, such as patients and young children.},
urldate = {2017-01-18},
Expand Down
6 changes: 3 additions & 3 deletions fmriprep/data/tests/ds000005/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This dataset was obtained from the OpenfMRI project (http://www.openfmri.org).
This dataset was obtained from the OpenfMRI project (https://www.openfmri.org).
Accession #: ds005
Description: Mixed-gambles task

Expand All @@ -14,9 +14,9 @@ Release history:

This dataset is made available under the Public Domain Dedication and License
v1.0, whose full text can be found at
http://www.opendatacommons.org/licenses/pddl/1.0/.
https://opendatacommons.org/licenses/pddl/1-0/.
We hope that all users will follow the ODC Attribution/Share-Alike
Community Norms (http://www.opendatacommons.org/norms/odc-by-sa/);
Community Norms (https://opendatacommons.org/norms/odc-by-sa/);
in particular, while not legally required, we hope that all users
of the data will acknowledge the OpenfMRI project and NSF Grant
OCI-1131441 (R. Poldrack, PI) in any publications.
2 changes: 1 addition & 1 deletion fmriprep/data/tests/ds000005/dataset_description.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"BIDSVersion": "1.0.0rc4",
"License": "This dataset is made available under the Public Domain Dedication and License \nv1.0, whose full text can be found at \nhttp://www.opendatacommons.org/licenses/pddl/1.0/. \nWe hope that all users will follow the ODC Attribution/Share-Alike \nCommunity Norms (http://www.opendatacommons.org/norms/odc-by-sa/); \nin particular, while not legally required, we hope that all users \nof the data will acknowledge the OpenfMRI project and NSF Grant \nOCI-1131441 (R. Poldrack, PI) in any publications.",
"License": "This dataset is made available under the Public Domain Dedication and License \nv1.0, whose full text can be found at \nhttps://opendatacommons.org/licenses/pddl/1-0/. \nWe hope that all users will follow the ODC Attribution/Share-Alike \nCommunity Norms (https://opendatacommons.org/norms/odc-by-sa/); \nin particular, while not legally required, we hope that all users \nof the data will acknowledge the OpenfMRI project and NSF Grant \nOCI-1131441 (R. Poldrack, PI) in any publications.",
"Name": "Mixed-gambles task",
"Authors": ["Tom, S.M.", "Fox, C.R.", "Trepel, C.", "Poldrack, R.A."],
"ReferencesAndLinks": "Tom, S.M., Fox, C.R., Trepel, C., Poldrack, R.A. (2007). The neural basis of loss aversion in decision-making under risk. Science, 315(5811):515-8"
Expand Down

0 comments on commit 87fc8b1

Please sign in to comment.