Skip to content

Commit

Permalink
Merge pull request astropy#344 from astrofrog/parallel-safe
Browse files Browse the repository at this point in the history
Mark sphinx extensions as parallel-safe
  • Loading branch information
bsipocz committed Sep 30, 2017
2 parents 231766d + 15020bc commit a58af8e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ astropy-helpers Changelog
- It is now possible to override generated timestamps to make builds
reproducible by setting the ``SOURCE_DATE_EPOCH`` environment variable [#341]

- Mark Sphinx extensions as parallel-safe. [#344]

2.0.1 (2017-07-28)
------------------

Expand Down
4 changes: 4 additions & 0 deletions astropy_helpers/sphinx/ext/changelog_links.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ def setup_patterns_rexes(app):


def setup(app):

app.connect('doctree-resolved', process_changelog_links)
app.connect('builder-inited', setup_patterns_rexes)
app.add_config_value('github_issues_url', None, True)
app.add_config_value('changelog_links_docpattern', ['.*changelog.*', 'whatsnew/.*'], True)

return {'parallel_read_safe': True,
'parallel_write_safe': True}
4 changes: 4 additions & 0 deletions astropy_helpers/sphinx/ext/doctest.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ class DoctestRequiresDirective(DoctestSkipDirective):


def setup(app):

app.add_directive('doctest-requires', DoctestRequiresDirective)
app.add_directive('doctest-skip', DoctestSkipDirective)
app.add_directive('doctest-skip-all', DoctestSkipDirective)

return {'parallel_read_safe': True,
'parallel_write_safe': True}
4 changes: 4 additions & 0 deletions astropy_helpers/sphinx/ext/edit_on_github.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ def html_page_context(app, pagename, templatename, context, doctree):


def setup(app):

app.add_config_value('edit_on_github_project', 'REQUIRED', True)
app.add_config_value('edit_on_github_branch', 'master', True)
app.add_config_value('edit_on_github_source_root', 'lib', True)
Expand All @@ -162,3 +163,6 @@ def setup(app):

app.connect('doctree-read', doctree_read)
app.connect('html-page-context', html_page_context)

return {'parallel_read_safe': True,
'parallel_write_safe': True}
4 changes: 4 additions & 0 deletions astropy_helpers/sphinx/ext/tocdepthfix.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ def fix_toc_entries(app, doctree):


def setup(app):

app.connect('doctree-read', fix_toc_entries)

return {'parallel_read_safe': True,
'parallel_write_safe': True}

0 comments on commit a58af8e

Please sign in to comment.