Nilearn sprint example consolidation #2013
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…cted_confounds
…cted_confounds
…cted_confounds
…cted_confounds
|
Can you merge on master: travis is fixed! |
…_3d_array and moving it in nilearn/masking.py with the relevant tests and import changes
|
Darn. The error is still there. Maybe you could try compiling the rst file on your computer. |
|
I suggested two modifications that might help. |
Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
…arn-sprint-example-consolidation
|
Wow, that ran!! |
|
Merging! |
This was referenced Oct 14, 2019
kchawla-pi
pushed a commit
that referenced
this pull request
Oct 17, 2019
…s) (#2183) * doc: update whats_new to reference PR2013 * doc: address @kchawla-pi review comment
kchawla-pi
added a commit
to kchawla-pi/nilearn
that referenced
this pull request
Oct 17, 2019
* 'master' of github.com:nilearn/nilearn: [DOC] Update whats_new to reference nilearn#2013 (Merging of several examples) (nilearn#2183)
kchawla-pi
added a commit
to pausz/nilearn
that referenced
this pull request
Oct 18, 2019
…smooth-image * 'master' of https://github.com/nilearn/nilearn: (114 commits) [DOC] Update whats_new to reference nilearn#2013 (Merging of several examples) (nilearn#2183) Removed sub-example due to unfit for lasso dataset - unstable float values (nilearn#2177) Fix Flake8 errors overlooked when merging PR nilearn#2028 (Plot connectome strength) (nilearn#2174) ENH: add connectome strength plot (nilearn#2028) Fix cache mixin tests (nilearn#2161) Do not fail if metadata cannot be updated for an image (nilearn#2167) [MRG] Nans in view connectome (nilearn#2166) [MRG] FIX: orientation problem with plot_glass_brain (nilearn#1888) Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162) Fixing malfunctioning allowed-failure section in Travis (nilearn#2160) Update Brainomics fetcher (nilearn#2097) Remove inplace modification in signal.clean (nilearn#2125) Iter age group prediction example (nilearn#2063) Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157) Replac conda with pip in TravisCI setup (nilearn#2141) Core devs doc and add @emdupre (nilearn#2151) Add check for vmin, vmax in plot_surf_roi (nilearn#2052) [ENH] Initial visual reports (nilearn#2019) Renamed test to deduplicate name (nilearn#2144) Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126) ...
kchawla-pi
added a commit
to kchawla-pi/nilearn
that referenced
this pull request
Oct 24, 2019
…te-req-dev * 'master' of https://github.com/nilearn/nilearn: (336 commits) Release Nilearn 0.6.0 alpha (nilearn#2164) Making fetch_localizer_button_task backwards compatibile (nilearn#2182) [DOC] Update whats_new to reference nilearn#2013 (Merging of several examples) (nilearn#2183) Removed sub-example due to unfit for lasso dataset - unstable float values (nilearn#2177) Fix Flake8 errors overlooked when merging PR nilearn#2028 (Plot connectome strength) (nilearn#2174) ENH: add connectome strength plot (nilearn#2028) Fix cache mixin tests (nilearn#2161) Do not fail if metadata cannot be updated for an image (nilearn#2167) [MRG] Nans in view connectome (nilearn#2166) [MRG] FIX: orientation problem with plot_glass_brain (nilearn#1888) Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162) Fixing malfunctioning allowed-failure section in Travis (nilearn#2160) Update Brainomics fetcher (nilearn#2097) Remove inplace modification in signal.clean (nilearn#2125) Iter age group prediction example (nilearn#2063) Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157) Replac conda with pip in TravisCI setup (nilearn#2141) Core devs doc and add @emdupre (nilearn#2151) Add check for vmin, vmax in plot_surf_roi (nilearn#2052) [ENH] Initial visual reports (nilearn#2019) ...
kchawla-pi
added a commit
to illdopejake/nilearn
that referenced
this pull request
Nov 9, 2019
…nt_modify_fetch_dev * 'master' of https://github.com/nilearn/nilearn: Verbose doc building to ease tracking of progress & diagnose stalls (nilearn#2203) New conda env is created once conda path has been activated Conda environment is created for full-builds Refactor CircleCI config for reduced redundancy (nilearn#2204) Installation should fail on Python < 3.5 (nilearn#2198) [MRG] Add get data function (nilearn#2172) fix error when colorscale given boolean array (nilearn#2193) remove is_valid filter (nilearn#2169) Moved new entries to next release FIX: marker size issue in plot_connectome nilearn#2185 (nilearn#2186) Updated Appveyor status badge Run tests on local Windows machines & Azure Pipelines (nilearn#2191) Updated requirements list for devs (nilearn#2190) Update azure-pipelines.yml for Azure Pipelines Release Nilearn 0.6.0 alpha (nilearn#2164) Making fetch_localizer_button_task backwards compatibile (nilearn#2182) [DOC] Update whats_new to reference nilearn#2013 (Merging of several examples) (nilearn#2183)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have merged notebooks 8.4.1 and 8.4.7 into one example that covers both ICA and dictionary learning and compares them. I have also updated User Guide 3.3 (ICA resting-state) to a) remove code and b) fix links to examples. Finally, I have edited the links for a few other pages that link to examples 8.4.1 and 8.4.7.
EDIT: We have now merged in a previous pull request (#2023 ). Here is the description for that PR:
At @KamalakerDadi 's request, I merged examples 8.4.5 + 8.4.8 (see issue #1986 ). This mostly involved stacking them and removing some redundancies.
I also noticed that 5 subjects were downloaded, but only one was used. So I changed n_subjects=1.
Finally, I fixed a few links pointing to notebook 8.4.5 (none I could find pointed to 8.4.8).