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

Upgrade to Sphinx 1.8.5 #26451

Closed
saraedum opened this issue Oct 10, 2018 · 169 comments
Closed

Upgrade to Sphinx 1.8.5 #26451

saraedum opened this issue Oct 10, 2018 · 169 comments

Comments

@saraedum
Copy link
Member

This ticket upgrades Sphinx to version 1.8.5.

Our previous upgrade was to Sphinx 1.7.6 in #26033.

Tarball: https://files.pythonhosted.org/packages/2a/86/8e1e8400bb6eca5ed960917952600fce90599e1cb0d20ddedd81ba163370/Sphinx-1.8.5.tar.gz

Depends on #27528

CC: @timokau @kiwifb @antonio-rojas @embray @slel @jhpalmieri @dimpase @tobihan

Component: packages: standard

Keywords: sphinx, conda, upgrade

Author: Julian Rüth, Jeroen Demeyer, John Palmieri, Tobias Hansen

Branch/Commit: f1a08e3

Reviewer: Dima Pasechnik

Issue created by migration from https://trac.sagemath.org/ticket/26451

@saraedum saraedum added this to the sage-8.4 milestone Oct 10, 2018
@saraedum
Copy link
Member Author

comment:1

Note that there is nothing I can doctest here.

@saraedum
Copy link
Member Author

Branch: u/saraedum/26451

@saraedum
Copy link
Member Author

Work Issues: is the patchbot happy?

@saraedum
Copy link
Member Author

Commit: eb00e75

@saraedum
Copy link
Member Author

New commits:

eb00e75Call Sphinx() 1.8 constructor

@saraedum
Copy link
Member Author

Changed keywords from none to sphinx, conda

@jdemeyer
Copy link

comment:6

I'd rather upgrade Sphinx while we're at it. That's a good thing to do and I would need to do that anyway to test this ticket.

@saraedum
Copy link
Member Author

comment:7

I was fearing that you would propose that ;)

I am not planning on working on upgrading Sphinx in Sage (as I've got too many other things to worry about.) I don't know what has chahnged in 1.8.1 and whether we would want to upgrade at all.

More generally, I don't know what we're aiming for here. I feel we don't have enough people to keep Sage-the-distribution close to upstream most of the time so that's probably not what we should be aiming for?

That said, feel free to upgrade Sphinx :) But if anybody likes these small changes and we want to move the Sphinx upgrade into a separate ticket, I would prefer that.

@saraedum

This comment has been minimized.

@antonio-rojas

This comment has been minimized.

@antonio-rojas
Copy link
Contributor

comment:9

Upgrading sphinx requires further changes to make docs build. I have a minimal patch at https://git.archlinux.org/svntogit/community.git/tree/trunk/sagemath-doc-sphinx-1.8.patch?h=packages/sagemath-doc
to make it build, although with it one still gets lots of deprecation warnings due to changes in logging functions.

@antonio-rojas

This comment has been minimized.

@jdemeyer
Copy link

comment:11

Antonio, does Sphinx 1.8.1 work with just those changes (even if there are deprecation warnings)? If so, we might as well upgrade.

@antonio-rojas
Copy link
Contributor

comment:12

Replying to @jdemeyer:

Antonio, does Sphinx 1.8.1 work with just those changes (even if there are deprecation warnings)? If so, we might as well upgrade.

Yes, with Julian's patch and mine introspection works and docs build correctly.

@jdemeyer

This comment has been minimized.

@jdemeyer
Copy link

Changed work issues from is the patchbot happy? to none

@jdemeyer
Copy link

Changed author from Julian Rüth to Julian Rüth, Jeroen Demeyer

@jdemeyer jdemeyer changed the title Prepare for sphinx 1.8 Upgrade to sphinx 1.8.1 Oct 10, 2018
@saraedum
Copy link
Member Author

comment:14

jdemeyer, did you forget to push your branch? (you added yourself as an Author but did not push any changes it seems.)

@jdemeyer
Copy link

comment:15

Please give me time...

@saraedum
Copy link
Member Author

comment:16

Note that there is a licensing issue in sphinxify.py, see #26453.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Mar 24, 2019

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

48b7acdtrac 27528: remove some patches for Sphinx and pygments.
b23b8cctrac 27528: use a custom Sphinx transform to handle
687b338trac 27528: clean up some code-blocks in the reST documentation.
e1794bbtrac 26451: upgrade to Sphinx 1.8.5.
c61a041trac 26451: Call Sphinx() 1.8 constructor
5e32410trac 26451: change 'app.builder.info' to 'logger.info'.
0a92d48trac 26451: inventory builder: remove _static directory upon cleanup,

@jhpalmieri
Copy link
Member

comment:125

Here is a new branch which is based on #27528. I put the <BLANKLINE> stuff at #27528, not here, since I needed it there.

@jhpalmieri jhpalmieri changed the title Upgrade to Sphinx 1.8.4 Upgrade to Sphinx 1.8.5 Mar 24, 2019
@embray
Copy link
Contributor

embray commented Mar 25, 2019

comment:127

Ticket retargeted after milestone closed (if you don't believe this ticket is appropriate for the Sage 8.8 release please retarget manually)

@embray embray modified the milestones: sage-8.7, sage-8.8 Mar 25, 2019
@jhpalmieri

This comment has been minimized.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Mar 25, 2019

Branch pushed to git repo; I updated commit sha1. New commits:

737afd8trac 26451: fix one doctest

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Mar 25, 2019

Changed commit from 0a92d48 to 737afd8

@jhpalmieri
Copy link
Member

comment:130

PDF documentation builds fine for me.

@dimpase
Copy link
Member

dimpase commented Mar 26, 2019

comment:131

looks good to me.

@jhpalmieri
Copy link
Member

comment:132

Great! Now we need to silence all of the stupid deprecation warnings.

@jhpalmieri
Copy link
Member

comment:133

See #27578 for a ticket to stop using the deprecated formatargspec.

@vbraun
Copy link
Member

vbraun commented Mar 30, 2019

comment:134

Merge conflict

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Mar 31, 2019

Changed commit from 737afd8 to f1a08e3

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Mar 31, 2019

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

a55438etrac 26451: upgrade to Sphinx 1.8.5.
827ff80trac 26451: Call Sphinx() 1.8 constructor
22736d7trac 26451: change 'app.builder.info' to 'logger.info'.
4cab150trac 26451: inventory builder: remove _static directory upon cleanup,
f1a08e3trac 26451: fix one doctest

@jhpalmieri
Copy link
Member

comment:136

Rebased.

@vbraun
Copy link
Member

vbraun commented Apr 2, 2019

Changed branch from u/jhpalmieri/26451 to f1a08e3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests