From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: Markus Heiser <markus.heiser@darmarit.de>
Cc: Jani Nikula <jani.nikula@intel.com>,
Jonathan Corbet <corbet@lwn.net>,
Linux Media Mailing List <linux-media@vger.kernel.org>,
linux-doc@vger.kernel.org
Subject: Re: [PATCH 1/3] doc-rst:c-domain: fix sphinx version incompatibility
Date: Tue, 6 Sep 2016 12:55:18 -0300 [thread overview]
Message-ID: <20160906125518.05a9d9fd@vento.lan> (raw)
In-Reply-To: <3F2C3A86-D578-4978-AFFB-8B34DA758BE6@darmarit.de>
Em Tue, 6 Sep 2016 17:10:53 +0200
Markus Heiser <markus.heiser@darmarit.de> escreveu:
> Am 06.09.2016 um 15:34 schrieb Jani Nikula <jani.nikula@intel.com>:
>
> > On Tue, 06 Sep 2016, Jonathan Corbet <corbet@lwn.net> wrote:
> >> On Wed, 31 Aug 2016 17:29:30 +0200
> >> Markus Heiser <markus.heiser@darmarit.de> wrote:
> >>
> >>> + if major >= 1 and minor < 4:
> >>> + # indexnode's tuple changed in 1.4
> >>> + # https://github.com/sphinx-doc/sphinx/commit/e6a5a3a92e938fcd75866b4227db9e0524d58f7c
> >>> + self.indexnode['entries'].append(
> >>> + ('single', indextext, targetname, ''))
> >>> + else:
> >>> + self.indexnode['entries'].append(
> >>> + ('single', indextext, targetname, '', None))
> >>
> >> So this doesn't seem right. We'll get the four-entry tuple behavior with
> >> 1.3 and the five-entry behavior with 1.4...but what happens when 2.0
> >> comes out?
> >>
> >> Did you want maybe:
> >>
> >> if major == 1 and minor < 4:
> >>
> >> ?
> >>
> >> (That will fail on 0.x, but we've already stated that we don't support
> >> below 1.2).
> >
> > Is there a way to check the number of entries expected in the tuples
> > instead of trying to match the version?
>
> Sadly not, the dissection of the tuple is spread around the source :(
>
> Sphinx has some more of these tuples with fixed length (remember
> conf.py, the latex_documents settings) where IMHO hash/value pairs
> (dicts) are more suitable.
Well, the LaTeX stuff at conf.py seems to have a new field on version
1.4.x. At least, our config has:
# (source start file, name, description, authors, manual section).
but 1.4.x docs mentions another tuple: toctree_only.
Regards,
Mauro
next prev parent reply other threads:[~2016-09-06 15:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-31 15:29 [RFC PATCH 0/3] doc-rst:c-domain: fix some issues in the c-domain Markus Heiser
2016-08-31 15:29 ` [PATCH 1/3] doc-rst:c-domain: fix sphinx version incompatibility Markus Heiser
2016-09-06 12:19 ` Jonathan Corbet
2016-09-06 12:24 ` Markus Heiser
2016-09-06 12:30 ` Jonathan Corbet
2016-09-06 13:34 ` Jani Nikula
2016-09-06 15:10 ` Markus Heiser
2016-09-06 15:55 ` Mauro Carvalho Chehab [this message]
2016-09-07 8:01 ` Markus Heiser
2016-08-31 15:29 ` [PATCH 2/3] doc-rst:c-domain: function-like macros arguments Markus Heiser
2016-09-06 12:27 ` Jonathan Corbet
2016-09-07 5:26 ` Markus Heiser
2016-08-31 15:29 ` [PATCH 3/3] doc-rst:c-domain: function-like macros index entry Markus Heiser
2016-09-06 12:28 ` 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=20160906125518.05a9d9fd@vento.lan \
--to=mchehab@infradead.org \
--cc=corbet@lwn.net \
--cc=jani.nikula@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=markus.heiser@darmarit.de \
/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).