From 9c9ac82bfbdefa4251aa20ad4830504d1c5c5b5d Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 14 Nov 2018 21:17:58 -0600 Subject: [PATCH 1/2] DOC: fix the build maybe --- doc/sphinxext/contributors.py | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/doc/sphinxext/contributors.py b/doc/sphinxext/contributors.py index 0f04d47435699..dae7871982b55 100644 --- a/doc/sphinxext/contributors.py +++ b/doc/sphinxext/contributors.py @@ -8,10 +8,10 @@ code contributors and commits, and then list each contributor individually. """ +from announce import build_components from docutils import nodes from docutils.parsers.rst import Directive - -from announce import build_components +import git class ContributorsDirective(Directive): @@ -19,17 +19,25 @@ class ContributorsDirective(Directive): name = 'contributors' def run(self): - components = build_components(self.arguments[0]) - - message = nodes.paragraph() - message += nodes.Text(components['author_message']) - - listnode = nodes.bullet_list() - - for author in components['authors']: - para = nodes.paragraph() - para += nodes.Text(author) - listnode += nodes.list_item('', para) + range_ = self.arguments[0] + try: + components = build_components(range_) + except git.GitCommandError: + return [ + self.state.document.reporter.warning( + "Cannot find contributors for range '{}'".format(range_), + line=self.lineno) + ] + else: + message = nodes.paragraph() + message += nodes.Text(components['author_message']) + + listnode = nodes.bullet_list() + + for author in components['authors']: + para = nodes.paragraph() + para += nodes.Text(author) + listnode += nodes.list_item('', para) return [message, listnode] From d09998eccf91b31534d82503bad7e489849bc257 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 14 Nov 2018 21:18:44 -0600 Subject: [PATCH 2/2] DOC: fix the build maybe --- doc/sphinxext/contributors.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/sphinxext/contributors.py b/doc/sphinxext/contributors.py index dae7871982b55..8c9fa5bc961d1 100644 --- a/doc/sphinxext/contributors.py +++ b/doc/sphinxext/contributors.py @@ -8,11 +8,12 @@ code contributors and commits, and then list each contributor individually. """ -from announce import build_components from docutils import nodes from docutils.parsers.rst import Directive import git +from announce import build_components + class ContributorsDirective(Directive): required_arguments = 1