LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Oleksandr Natalenko <oleksandr@redhat.com>
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
Jani Nikula <jani.nikula@linux.intel.com>,
Markus Heiser <markus.heiser@darmarit.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Subject: Re: [PATCH 0/8] docs: Fixes for recent versions of Sphinx
Date: Thu, 23 May 2019 11:39:44 +0200 [thread overview]
Message-ID: <20190523093944.mylk5l3ginkpelfi@butterfly.localdomain> (raw)
In-Reply-To: <20190522205034.25724-1-corbet@lwn.net>
Hi.
On Wed, May 22, 2019 at 02:50:26PM -0600, Jonathan Corbet wrote:
> The Sphinx folks deprecated some interfaces in the 2.0 release; one
> immediate result of that is a bunch of warnings that show up when building
> with 1.8. These two patches make those warnings go away, but at a cost:
>
> - It introduces a couple of Sphinx version checks, which are always
> ugly, but the alternative would be to stop supporting versions
> before 1.7. For now, I think we can carry that cruft.
>
> - The second patch causes the build to fail horribly on newer
> Sphinx installations. The change to switch_source_input() seems
> to make the parser much more finicky, increasing warnings and
> eventually failing the build altogether. In particular, it will
> scream about problems in .rst files that are not included in the
> TOC tree at all.
>
> This version of the patch set fixes up the worst problems (the i915 error
> in particular, which breaks the build hard). I've tested it with versions
> 1.4, 1.8, and 2.0.
>
> Given that these problems are already breaking builds on some systems, I
> think I may try to sell these changes to Linus for 5.2 still.
>
> Changes since v1:
> - Fix up a couple of logging changes I somehow missed
> - Don't save state when using switch_source_input()
> - Fix a few build errors
> - Add Mauro's sphinx-pre-install improvements
>
> Jonathan Corbet (7):
> doc: Cope with Sphinx logging deprecations
> doc: Cope with the deprecation of AutoReporter
> docs: fix numaperf.rst and add it to the doc tree
> lib/list_sort: fix kerneldoc build error
> docs: fix multiple doc build warnings in enumeration.rst
> docs/gpu: fix a documentation build break in i915.rst
> docs: Fix conf.py for Sphinx 2.0
>
> Mauro Carvalho Chehab (1):
> scripts/sphinx-pre-install: make it handle Sphinx versions
>
> Documentation/admin-guide/mm/index.rst | 1 +
> Documentation/admin-guide/mm/numaperf.rst | 2 +-
> Documentation/conf.py | 2 +-
> .../firmware-guide/acpi/enumeration.rst | 2 +-
> Documentation/gpu/i915.rst | 4 +-
> Documentation/sphinx/kerneldoc.py | 44 +++++++---
> Documentation/sphinx/kernellog.py | 28 +++++++
> Documentation/sphinx/kfigure.py | 40 +++++----
> lib/list_sort.c | 3 +-
> scripts/sphinx-pre-install | 81 +++++++++++++++++--
> 10 files changed, 166 insertions(+), 41 deletions(-)
> create mode 100644 Documentation/sphinx/kernellog.py
>
> --
> 2.21.0
>
Thanks for the efforts. I've run this on top of Linus' tree, and the
only sphinx-related deprecation warning I've spotted is this one:
/home/onatalen/work/src/linux/Documentation/sphinx/cdomain.py:51: RemovedInSphinx30Warning: app.override_domain() is deprecated. Use app.add_domain() with override option instead.
app.override_domain(CDomain)
Otherwise, it builds.
--
Best regards,
Oleksandr Natalenko (post-factum)
Senior Software Maintenance Engineer
next prev parent reply other threads:[~2019-05-23 9:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 20:50 Jonathan Corbet
2019-05-22 20:50 ` [PATCH 1/8] doc: Cope with Sphinx logging deprecations Jonathan Corbet
2019-05-22 20:50 ` [PATCH 2/8] doc: Cope with the deprecation of AutoReporter Jonathan Corbet
2019-05-22 20:50 ` [PATCH 3/8] docs: fix numaperf.rst and add it to the doc tree Jonathan Corbet
2019-05-23 5:45 ` Mike Rapoport
2019-05-22 20:50 ` [PATCH 4/8] lib/list_sort: fix kerneldoc build error Jonathan Corbet
2019-05-22 20:50 ` [PATCH 5/8] docs: fix multiple doc build warnings in enumeration.rst Jonathan Corbet
2019-05-22 20:50 ` [PATCH 6/8] docs/gpu: fix a documentation build break in i915.rst Jonathan Corbet
2019-05-29 6:54 ` Daniel Vetter
2019-05-29 13:50 ` Jonathan Corbet
2019-05-22 20:50 ` [PATCH 7/8] docs: Fix conf.py for Sphinx 2.0 Jonathan Corbet
2019-05-22 20:50 ` [PATCH 8/8] scripts/sphinx-pre-install: make it handle Sphinx versions Jonathan Corbet
2019-05-22 21:22 ` Mauro Carvalho Chehab
2019-05-22 21:44 ` Mauro Carvalho Chehab
2019-05-23 9:39 ` Oleksandr Natalenko [this message]
2019-05-23 10:13 ` [PATCH 0/8] docs: Fixes for recent versions of Sphinx Jani Nikula
2019-05-23 10:15 ` Oleksandr Natalenko
2019-05-23 10:38 ` Mauro Carvalho Chehab
2019-05-23 13:48 ` Jonathan Corbet
2019-05-23 10:45 ` Mauro Carvalho Chehab
2019-05-23 11:22 ` Oleksandr Natalenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190523093944.mylk5l3ginkpelfi@butterfly.localdomain \
--to=oleksandr@redhat.com \
--cc=corbet@lwn.net \
--cc=jani.nikula@linux.intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus.heiser@darmarit.de \
--cc=mchehab@kernel.org \
--subject='Re: [PATCH 0/8] docs: Fixes for recent versions of Sphinx' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).