Skip to content
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

MAINT: sklearn Deprecations #2219

Merged
merged 2 commits into from
Nov 21, 2019
Merged

MAINT: sklearn Deprecations #2219

merged 2 commits into from
Nov 21, 2019

Conversation

larsoner
Copy link
Contributor

On latest sklearn master takes care of warnings of the form:

E   FutureWarning: The sklearn.utils.testing module is  deprecated in version 0.22 and will be removed in version 0.24. The corresponding classes / functions should instead be imported from sklearn.utils. Anything that cannot be imported from sklearn.utils is now part of the private API.

and

E   FutureWarning: The sklearn.datasets.base module is  deprecated in version 0.22 and will be removed in version 0.24. The corresponding classes / functions should instead be imported from sklearn.datasets. Anything that cannot be imported from sklearn.datasets is now part of the private API.

@codecov
Copy link

codecov bot commented Nov 18, 2019

Codecov Report

Merging #2219 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2219      +/-   ##
==========================================
- Coverage   92.36%   92.36%   -0.01%     
==========================================
  Files         149      149              
  Lines       18991    18990       -1     
  Branches     2307     2307              
==========================================
- Hits        17541    17540       -1     
  Misses        931      931              
  Partials      519      519
Impacted Files Coverage Δ
nilearn/datasets/struct.py 86.23% <100%> (ø) ⬆️
nilearn/datasets/tests/test_neurovault.py 95.84% <100%> (ø) ⬆️
nilearn/_utils/testing.py 78.76% <100%> (ø) ⬆️
nilearn/datasets/neurovault.py 88.43% <100%> (ø) ⬆️
nilearn/datasets/func.py 82.79% <100%> (-0.04%) ⬇️
nilearn/datasets/atlas.py 85.35% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0941897...b8774b9. Read the comment docs.

@bthirion
Copy link
Member

LGTM, thx !

@kchawla-pi
Copy link
Collaborator

Looks fine to me as well.

@kchawla-pi kchawla-pi merged commit 39c798e into nilearn:master Nov 21, 2019
kchawla-pi added a commit to kchawla-pi/nilearn that referenced this pull request Nov 21, 2019
* 'master' of github.com:nilearn/nilearn:
  Add testing for Nilearn setup & install & Fix the broken dependency installation (nilearn#2201)
  Fix uniform ball cloud test for sklearn >= 0.22 (nilearn#2175)
  MAINT: sklearn Deprecations (nilearn#2219)
  DOC: title in bold
  [DOC] Add note about decreasing memory usage (nilearn#2223)
kchawla-pi added a commit to pausz/nilearn that referenced this pull request Nov 21, 2019
…smooth-image

* 'master' of https://github.com/nilearn/nilearn: (25 commits)
  Add testing for Nilearn setup & install & Fix the broken dependency installation (nilearn#2201)
  Fix uniform ball cloud test for sklearn >= 0.22 (nilearn#2175)
  MAINT: sklearn Deprecations (nilearn#2219)
  DOC: title in bold
  [DOC] Add note about decreasing memory usage (nilearn#2223)
  Rel 060b0 (nilearn#2208)
  Nilearn 0.6.0b0 release (nilearn#2206)
  Fixed the redundant & missing test case in merged PR nilearn#2035 (nilearn#2205)
  Modify fetch_development_fmri to fetch adults or children (nilearn#2035)
  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
  ...
@larsoner larsoner deleted the dep branch November 21, 2019 15:11
kchawla-pi added a commit to darya-chyzhyk/nilearn that referenced this pull request Nov 24, 2019
…s-craddock

* 'master' of https://github.com/nilearn/nilearn: (620 commits)
  CI: Test pre-release versions of dependencies (nilearn#2224)
  Fix:  nilearn.image.smooth_img fails if fwhm is an ndarray (nilearn#2107)
  Update Python version warnings for Py35 deprecation (nilearn#2214)
  Fixing failure in minimum build of TravisCI (nilearn#2227)
  Updated missing whats_new entry
  Add testing for Nilearn setup & install & Fix the broken dependency installation (nilearn#2201)
  Fix uniform ball cloud test for sklearn >= 0.22 (nilearn#2175)
  MAINT: sklearn Deprecations (nilearn#2219)
  DOC: title in bold
  [DOC] Add note about decreasing memory usage (nilearn#2223)
  Rel 060b0 (nilearn#2208)
  Nilearn 0.6.0b0 release (nilearn#2206)
  Fixed the redundant & missing test case in merged PR nilearn#2035 (nilearn#2205)
  Modify fetch_development_fmri to fetch adults or children (nilearn#2035)
  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)
  ...

# Conflicts:
#	nilearn/datasets/atlas.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants