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

CLN: remove nose fixtures in docs #10187

Merged
merged 1 commit into from
Nov 22, 2017

Conversation

jorisvandenbossche
Copy link
Member

Reference Issues/PRs

Follow-up on #9697 and #9840

This removes the _fixtures.py in the docs which were used by nose. The pytest equivalent is the conftest.py file that @lesteve already added before.

@lesteve I moved the conftest.py one level up to the root of the docs, so we can use one for all docs. I can also leave it in doc/datasets/, and then add another conftest.py in doc/tutorial/, doc/modules/ if you prefer that.

@lesteve
Copy link
Member

lesteve commented Nov 22, 2017

This removes the _fixtures.py in the docs which were used by nose. The pytest equivalent is the conftest.py file that @lesteve already added before.

Good catch, thanks a lot!

@lesteve I moved the conftest.py one level up to the root of the docs, so we can use one for all docs. I can also leave it in doc/datasets/, and then add another conftest.py in doc/tutorial/, doc/modules/ if you prefer that.

I like a single conftest.py in doc. I thought exactly the same thing when I saw one of your PR adding a conftest.py in doc/modules.

@@ -65,7 +65,7 @@ def pytest_runtest_setup(item):
setup_rcv1()
elif fname.endswith('datasets/twenty_newsgroups.rst'):
setup_twenty_newsgroups()
elif fname.endswith('datasets/working_with_text_data.rst'):
elif fname.endswith('tutorial/text_analytics/working_with_text_data.rst'):
Copy link
Member

Choose a reason for hiding this comment

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

Hmmm ... I am wondering why this actually worked before ...

Copy link
Member

Choose a reason for hiding this comment

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

Oh well, I guess the 20 newsgroup data was just downloaded on Travis.

Copy link
Member

Choose a reason for hiding this comment

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

Yep see https://travis-ci.org/scikit-learn/scikit-learn/jobs/305782018#L2491 where doc/tutorial/text_analytics/working_with_text_data.rst was run (. instead of s)

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

I was also wondering that! :-)

@lesteve
Copy link
Member

lesteve commented Nov 22, 2017

LGTM, merging, thanks a lot! No need to wait for AppVeyor since don't run the doctests from the doc on AppVeyor.

@lesteve lesteve merged commit 816e2eb into scikit-learn:master Nov 22, 2017
@jorisvandenbossche jorisvandenbossche deleted the clean-doc-fixtures branch November 22, 2017 17:16
jwjohnson314 pushed a commit to jwjohnson314/scikit-learn that referenced this pull request Dec 18, 2017
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.

2 participants