From: Jani Nikula <jani.nikula@intel.com>
To: Matthew Wilcox <willy@infradead.org>, Takashi Iwai <tiwai@suse.de>
Cc: Jonathan Corbet <corbet@lwn.net>, Jiri Slaby <jslaby@suse.cz>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] Documentation/sphinx: Fix Directive import error
Date: Fri, 02 Mar 2018 21:00:53 +0200 [thread overview]
Message-ID: <87tvtyti8q.fsf@intel.com> (raw)
In-Reply-To: <20180302184014.GG31400@bombadil.infradead.org>
On Fri, 02 Mar 2018, Matthew Wilcox <willy@infradead.org> wrote:
> From: Matthew Wilcox <mawilcox@microsoft.com>
>
> Sphinx 1.7 removed sphinx.util.compat.Directive so people
> who have upgraded cannot build the documentation. Switch to
> docutils.parsers.rst.Directive which has been available since
> docutils 0.5 released in 2009.
>
> Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1083694
> Co-developed-by: Takashi Iwai <tiwai@suse.de>
> Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
I think this is the best approach.
FWIW,
Acked-by: Jani Nikula <jani.nikula@intel.com>
>
> diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py
> index 39aa9e8697cc..fbedcc39460b 100644
> --- a/Documentation/sphinx/kerneldoc.py
> +++ b/Documentation/sphinx/kerneldoc.py
> @@ -36,8 +36,7 @@ import glob
>
> from docutils import nodes, statemachine
> from docutils.statemachine import ViewList
> -from docutils.parsers.rst import directives
> -from sphinx.util.compat import Directive
> +from docutils.parsers.rst import directives, Directive
> from sphinx.ext.autodoc import AutodocReporter
>
> __version__ = '1.0'
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2018-03-02 19:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 15:28 [PATCH v2] Documentation/sphinx: Fix Directive import error Takashi Iwai
2018-03-02 16:01 ` Jani Nikula
2018-03-02 16:42 ` Matthew Wilcox
2018-03-02 18:28 ` Matthew Wilcox
2018-03-02 16:34 ` Matthew Wilcox
2018-03-02 18:40 ` [PATCH v3] " Matthew Wilcox
2018-03-02 19:00 ` Jani Nikula [this message]
2018-03-07 17:12 ` Jonathan Corbet
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=87tvtyti8q.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=corbet@lwn.net \
--cc=jslaby@suse.cz \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.de \
--cc=willy@infradead.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).