-
Notifications
You must be signed in to change notification settings - Fork 580
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
[MRG] Replac conda with pip in CI setup #2141
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2141 +/- ##
==========================================
+ Coverage 92.21% 92.38% +0.16%
==========================================
Files 149 149
Lines 18752 18752
Branches 2277 2277
==========================================
+ Hits 17293 17324 +31
+ Misses 944 917 -27
+ Partials 515 511 -4
Continue to review full report at Codecov.
|
thanks! apart from the small question above +1 for merge |
Thanks. I will unpin conda==4.6 next and then test these changes in AppveyorCI. Only then can we merge this. |
I just remembered conda 4.7 was glitching for python3.5 installation so maybe not unpin it then. |
I think you can leave it pinned for now |
That would make this PR very easy, but it will still leave older version of conda in play, which kind of defeats the purpose of the PR. If we were gonna rely on a pinned conda, then we don't need pip anyway. I'll use TravisCIs automatic virtualenvs. Then we'll see. |
…e builds - Removed unused code.
Appveyor manages its own conda installation as part of its images for Python 3.5 so we don't need to change that and CircleCI uses the latest packages so Between the 2 of them Conda is covered. This is ready for a review. |
@jeromedockes Second review? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that I'm not an expert in Circelci configs...
.travis.yml
Outdated
|
||
virtualenv: | ||
system_site_packages: true | ||
#virtualenv: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can remove the commented-out lines
continuous_integration/install.sh
Outdated
@@ -25,7 +25,7 @@ create_new_venv() { | |||
pip install nose pytest | |||
} | |||
|
|||
print_conda_requirements() { | |||
echo_requirements_string() { | |||
# Echo a conda requirement string for example |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this comment is slightly outdated
920b285
to
48499bc
Compare
…encoding * 'master' of github.com:nilearn/nilearn: (228 commits) 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) Update Schaefer parcelation to v0.14.3 (nilearn#2138) MAINT: Future-compatible cmap reversal (nilearn#2131) fix openmp crash (nilearn#2140) change nose to pytest on appveyor (nilearn#2130) adding fix to whatsnew fix wrong urls in nki dataset Made Flake8 happy added whats_new Added test for labels=None More explicit doc string Test for right length of labels Added tests for empty list case and labels as ndarray ensure labels is a list, not an ndarray ...
…stats * 'master' of github.com:nilearn/nilearn: 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)
…s_brain_orientation * 'master' of https://github.com/nilearn/nilearn: (116 commits) 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) Update Schaefer parcelation to v0.14.3 (nilearn#2138) MAINT: Future-compatible cmap reversal (nilearn#2131) fix openmp crash (nilearn#2140) change nose to pytest on appveyor (nilearn#2130) adding fix to whatsnew fix wrong urls in nki dataset Made Flake8 happy added whats_new ... # Conflicts: # doc/whats_new.rst
…lot_connectome_strength * 'master' of https://github.com/nilearn/nilearn: (272 commits) [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) Update Schaefer parcelation to v0.14.3 (nilearn#2138) MAINT: Future-compatible cmap reversal (nilearn#2131) fix openmp crash (nilearn#2140) change nose to pytest on appveyor (nilearn#2130) adding fix to whatsnew fix wrong urls in nki dataset Made Flake8 happy ... # Conflicts: # examples/03_connectivity/plot_sphere_based_connectome.py
…ounds_for_connectome * 'master' of https://github.com/nilearn/nilearn: (227 commits) [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) Update Schaefer parcelation to v0.14.3 (nilearn#2138) MAINT: Future-compatible cmap reversal (nilearn#2131) fix openmp crash (nilearn#2140) change nose to pytest on appveyor (nilearn#2130) adding fix to whatsnew fix wrong urls in nki dataset Made Flake8 happy ...
…_roi_contours * 'master' of https://github.com/nilearn/nilearn: (227 commits) [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) Update Schaefer parcelation to v0.14.3 (nilearn#2138) MAINT: Future-compatible cmap reversal (nilearn#2131) fix openmp crash (nilearn#2140) change nose to pytest on appveyor (nilearn#2130) adding fix to whatsnew fix wrong urls in nki dataset Made Flake8 happy ...
…nt_modify_fetch_dev * 'master' of https://github.com/nilearn/nilearn: (228 commits) [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) Update Schaefer parcelation to v0.14.3 (nilearn#2138) MAINT: Future-compatible cmap reversal (nilearn#2131) fix openmp crash (nilearn#2140) change nose to pytest on appveyor (nilearn#2130) adding fix to whatsnew fix wrong urls in nki dataset ... # Conflicts: # nilearn/datasets/func.py
…ecomposition * 'master' of https://github.com/nilearn/nilearn: (348 commits) [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) Update Schaefer parcelation to v0.14.3 (nilearn#2138) MAINT: Future-compatible cmap reversal (nilearn#2131) fix openmp crash (nilearn#2140) change nose to pytest on appveyor (nilearn#2130) adding fix to whatsnew fix wrong urls in nki dataset Made Flake8 happy ... # Conflicts: # doc/connectivity/resting_state_networks.rst # doc/whats_new.rst # examples/03_connectivity/plot_canica_analysis.py
…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) ...
…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) ...
Fixes #2115
Conda has become unreliable for use with CIs. Replacing it with alternatives such as pip and apt seems a prudent long term solution.