* [PATCH] docs: Fix conf.py for Sphinx 2.0
@ 2020-03-20 6:18 Sean Anderson
2020-04-18 0:55 ` Sean Anderson
2020-04-24 17:09 ` Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Sean Anderson @ 2020-03-20 6:18 UTC (permalink / raw)
To: u-boot
From: Jonathan Corbet <corbet@lwn.net>
commit 3bc8088464712fdcb078eefb68837ccfcc413c88 upstream.
Our version check in Documentation/conf.py never envisioned a world where
Sphinx moved beyond 1.x. Now that the unthinkable has happened, fix our
version check to handle higher version numbers correctly.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
[rebase for u-boot]
Signed-off-by: Sean Anderson <seanga2@gmail.com>
---
doc/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/conf.py b/doc/conf.py
index 0772fb6f0c..8bb27ad9e2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -37,7 +37,7 @@ needs_sphinx = '1.3'
extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure']
# The name of the math extension changed on Sphinx 1.4
-if major == 1 and minor > 3:
+if (major == 1 and minor > 3) or (major > 1):
extensions.append("sphinx.ext.imgmath")
else:
extensions.append("sphinx.ext.pngmath")
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] docs: Fix conf.py for Sphinx 2.0
2020-03-20 6:18 [PATCH] docs: Fix conf.py for Sphinx 2.0 Sean Anderson
@ 2020-04-18 0:55 ` Sean Anderson
2020-04-24 17:09 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Sean Anderson @ 2020-04-18 0:55 UTC (permalink / raw)
To: u-boot
On 3/20/20 2:18 AM, Sean Anderson wrote:
> From: Jonathan Corbet <corbet@lwn.net>
>
> commit 3bc8088464712fdcb078eefb68837ccfcc413c88 upstream.
>
> Our version check in Documentation/conf.py never envisioned a world where
> Sphinx moved beyond 1.x. Now that the unthinkable has happened, fix our
> version check to handle higher version numbers correctly.
>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> [rebase for u-boot]
> Signed-off-by: Sean Anderson <seanga2@gmail.com>
> ---
>
> doc/conf.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/conf.py b/doc/conf.py
> index 0772fb6f0c..8bb27ad9e2 100644
> --- a/doc/conf.py
> +++ b/doc/conf.py
> @@ -37,7 +37,7 @@ needs_sphinx = '1.3'
> extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure']
>
> # The name of the math extension changed on Sphinx 1.4
> -if major == 1 and minor > 3:
> +if (major == 1 and minor > 3) or (major > 1):
> extensions.append("sphinx.ext.imgmath")
> else:
> extensions.append("sphinx.ext.pngmath")
>
*bump*
It's been a month, any comments on this?
--Sean
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] docs: Fix conf.py for Sphinx 2.0
2020-03-20 6:18 [PATCH] docs: Fix conf.py for Sphinx 2.0 Sean Anderson
2020-04-18 0:55 ` Sean Anderson
@ 2020-04-24 17:09 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2020-04-24 17:09 UTC (permalink / raw)
To: u-boot
On Fri, Mar 20, 2020 at 02:18:30AM -0400, Sean Anderson wrote:
> From: Jonathan Corbet <corbet@lwn.net>
>
> commit 3bc8088464712fdcb078eefb68837ccfcc413c88 upstream.
>
> Our version check in Documentation/conf.py never envisioned a world where
> Sphinx moved beyond 1.x. Now that the unthinkable has happened, fix our
> version check to handle higher version numbers correctly.
>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> [rebase for u-boot]
> Signed-off-by: Sean Anderson <seanga2@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/ee4a0436/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-24 17:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-20 6:18 [PATCH] docs: Fix conf.py for Sphinx 2.0 Sean Anderson
2020-04-18 0:55 ` Sean Anderson
2020-04-24 17:09 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.