8000 Sphinx 1.5.1 + sphinx-gallery 0.1.7 by naoyak · Pull Request #8143 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

Sphinx 1.5.1 + sphinx-gallery 0.1.7 #8143

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

Sphinx 1.5.1 + sphinx-gallery 0.1.7 #8143

wants to merge 4 commits into from

Conversation

naoyak
Copy link
Contributor
@naoyak naoyak commented Jan 2, 2017

Related: #8010

Pushing to see if docs build with latest sphinx fixes (works locally)

@naoyak
Copy link
Contributor Author
naoyak commented Jan 2, 2017 •
edited
Loading

Did a full build of the docs at http://scikit-learn.org/circle?7986

However Travis fails due to flake8 in the sphinx-gallery code...wasn't that supposed to be exempted? https://travis-ci.org/scikit-learn/scikit-learn/jobs/188191380

@naoyak naoyak changed the title [WIP] Sphinx 1.5.1 + sphinx-gallery 1.7.1 Sphinx 1.5.1 + sphinx-gallery 1.7.1 Jan 2, 2017
@tguillemot
Copy link
Contributor

@naoyak I think on that case we can pass through indeed.

@lesteve Seems OK for you ?

@lesteve
Copy link
Member
lesteve commented Jan 3, 2017

Worth looking at #7986 for the discussion and making sure that all concerns there were tackled.

cc @Titan-C.

The flake8 build on Travis was skipping the sphinx_gallery code at some point but it looks like we have lost this feature. This can be ignored for this PR.

@naoyak naoyak changed the title Sphinx 1.5.1 + sphinx-gallery 1.7.1 Sphinx 1.5.1 + sphinx-gallery 0.1.7 Jan 3, 2017
@naoyak
Copy link
Contributor Author
naoyak commented Jan 3, 2017 •
edited
Loading

I think the sphinx issue was fixed, but the tooltip issue in #7986 hasn't yet been merged by sphinx-gallery (sphinx-gallery/sphinx-gallery#185). Might be good to wait for a release from @Titan-C, and perhaps look into why the flake8 filter isn't working.

@naoyak naoyak mentioned this pull request Jan 3, 2017
Merged
@naoyak
Copy link
Contributor Author
naoyak commented Jan 3, 2017 •
edited
Loading

Testing a proposed change in sphinx-gallery (cc @Titan-C, ref sphinx-gallery/sphinx-gallery#191)
Building docs at http://scikit-learn.org/circle?8021

@lesteve
Copy link
Member
lesteve commented Jan 5, 2017

The flake8 build on Travis was skipping the sphinx_gallery code at some point but it looks like we have lost this feature. This can be ignored for this PR.

I understand why this is happening, still have to fix it though.

@lesteve lesteve mentioned this pull request Jan 16, 2017
Merged
@lesteve
Copy link
Member
lesteve commented Jan 16, 2017

I would strongly be in favour of upgrading to sphinx-gallery 0.1.7. Cosmetic changes can be dealt with later.

The reason is that all CircleCI builds are going to fail on sphinx 1.4 + docutils 0.13, see #8208 (comment).

@naoyak can you revert to a unmodified 0.1.7 sphinx-gallery?

@lesteve
Copy link
Member
lesteve commented Jan 16, 2017

@naoyak can you revert to a unmodified 0.1.7 sphinx-gallery?

I think this amounts to reverting your last 2 commits in this PR.

@Titan-C
Copy link
Contributor
Titan-C commented Jan 16, 2017

I have update to Sphinx-Gallery 0.1.7 in PR #7986 rebasing to master. In this PR I don't understand why file permissions were changed?

@lesteve
Copy link
Member
lesteve commented Jan 16, 2017

I have update to Sphinx-Gallery 0.1.7 in PR #7986 rebasing to master. In this PR I don't understand why file permissions were changed?

OK nice, thanks a lot, I'll look at your PR.

@lesteve
Copy link
Member
lesteve commented Jan 16, 2017

Closing this PR in favour of #7986.

@lesteve lesteve closed this Jan 16, 2017
@lesteve
Copy link
Member
lesteve commented Jan 16, 2017

Thanks a lot for your work @naoyak and sorry for the duplicated effort.

@naoyak
Copy link
Contributor Author
naoyak commented Jan 16, 2017

@lesteve @Titan-C no problem, thanks for checking this out.

@naoyak naoyak deleted the sphinx-fix branch January 19, 2017 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@naoyak @tguillemot @lesteve @Titan-C
0