Skip to content

[MRG] MNT Remove build_tools/windows/windows_testing_downloader.ps1#12974

Merged
rth merged 3 commits intoscikit-learn:masterfrom
nixphix:cleanup/nose-test
Jan 15, 2019
Merged

[MRG] MNT Remove build_tools/windows/windows_testing_downloader.ps1#12974
rth merged 3 commits intoscikit-learn:masterfrom
nixphix:cleanup/nose-test

Conversation

@nixphix
Copy link
Copy Markdown
Contributor

@nixphix nixphix commented Jan 13, 2019

What does this implement/fix? Explain your changes.

removes nose test configuration to prevent train_test_split function from detected as test case.

@adrinjalali
Copy link
Copy Markdown
Member

adrinjalali commented Jan 13, 2019

Thanks! build_tools/windows/windows_testing_downloader.ps1 and sklearn/utils/testing.py also seem to have some nose related things which I suppose can be removed.

@nixphix
Copy link
Copy Markdown
Contributor Author

nixphix commented Jan 13, 2019

Thanks! build_tools/windows/windows_testing_downloader.ps1

Yep that showed up in my search, thought that's there for Azure pipeline or something.

and sklearn/utils/testing.py also seem to have some nose related things which I suppose can be removed.

I wasn't sure if can remove them now as its slated for removal for version 0.22, apparently they are not used anywhere.

scikit-learn/sklearn/utils/testing.py

Lines 56 to 77 in a7b8b9e

try:
from nose.tools import raises as _nose_raises
deprecation_message = (
'sklearn.utils.testing.raises has been deprecated in version 0.20 '
'and will be removed in 0.22. Please use '
'sklearn.utils.testing.assert_raises instead.')
raises = deprecated(deprecation_message)(_nose_raises)
additional_names_in_all.append('raises')
except ImportError:
pass
try:
from nose.tools import with_setup as _with_setup
deprecation_message = (
'sklearn.utils.testing.with_setup has been deprecated in version 0.20 '
'and will be removed in 0.22.'
'If your code relies on with_setup, please use'
' nose.tools.with_setup instead.')
with_setup = deprecated(deprecation_message)(_with_setup)
additional_names_in_all.append('with_setup')
except ImportError:
pass

Let me clean them as well.

@rth
Copy link
Copy Markdown
Member

rth commented Jan 13, 2019

I wasn't sure if can remove them now as its slated for removal for version 0.22, apparently they are not used anywhere.

Because of that we will have to wait for v0.22 to remove them..

@nixphix
Copy link
Copy Markdown
Contributor Author

nixphix commented Jan 13, 2019

I wasn't sure if can remove them now as its slated for removal for version 0.22, apparently they are not used anywhere.

Because of that we will have to wait for v0.22 to remove them..

ok will roll back those changes

@nixphix nixphix changed the title [WIP] MNT Remove unused nose test configuration [MRG] MNT Remove unused nose test configuration Jan 13, 2019
jnothman
jnothman reviewed Jan 14, 2019
View reviewed changes
sklearn/utils/testing.py
additional_names_in_all = []
try:
from nose.tools import raises as _nose_raises
deprecation_message = (
Copy link
Copy Markdown
Member

@jnothman jnothman Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use a try-except-else rather than doing this in the try block (and rather than doing a second try block below)

Copy link
Copy Markdown
Contributor Author

@nixphix nixphix Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an existing code, I removed it because it had obsolete nose code then I rolled back the changes on @rth comment as the deprecation said code is slated for removal only in version 0.22.

@jnothman
Copy link
Copy Markdown
Member

jnothman commented Jan 15, 2019

Sorry I must have been looking at the wrong diff.

rth
rth approved these changes Jan 15, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@rth rth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @nixphix !

@rth rth changed the title [MRG] MNT Remove unused nose test configuration [MRG] MNT Remove build_tools/windows/windows_testing_downloader.ps1 Jan 15, 2019
@rth rth merged commit 41aa3ed into scikit-learn:master Jan 15, 2019
xhluca pushed a commit to xhluca/scikit-learn that referenced this pull request Apr 28, 2019
@nixphix
MNT Remove build_tools/windows/windows_testing_downloader.ps1 (scikit…
69527ae 
…-learn#12974)
xhluca pushed a commit to xhluca/scikit-learn that referenced this pull request Apr 28, 2019
Revert "MNT Remove build_tools/windows/windows_testing_downloader.ps1 (…
8993289 
…scikit-learn#12974)"

This reverts commit 69527ae.
xhluca pushed a commit to xhluca/scikit-learn that referenced this pull request Apr 28, 2019
Revert "MNT Remove build_tools/windows/windows_testing_downloader.ps1 (…
3e24357 
…scikit-learn#12974)"

This reverts commit 69527ae.
@trevorstephens trevorstephens mentioned this pull request May 26, 2019
Closed
koenvandevelde pushed a commit to koenvandevelde/scikit-learn that referenced this pull request Jul 12, 2019
@nixphix @koenvandevelde
MNT Remove build_tools/windows/windows_testing_downloader.ps1 (scikit…
a35fdf9 
…-learn#12974)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jnothman jnothman jnothman approved these changes

+1 more reviewer

@rth rth rth approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nixphix @adrinjalali @rth @jnothman