Skip to content

Commit

Permalink
bpo-30052: Always regenerate cross-references
Browse files Browse the repository at this point in the history
The patch for bpo-30052 changed the preferred link target
for :func:`bytes` and :func`bytearray` references to be the
respective type definitions rather than the corresponding
builtin function entries.

This patch changes the daily documentation builds to disable
the output caching in Sphinx, in order to ensure that
cross-reference changes like this one are reliably picked
up and applied automatically after merging.
  • Loading branch information
ncoghlan committed Apr 28, 2017
1 parent 5a4e3d8 commit 3766314
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,20 @@ serve:
../Tools/scripts/serve.py build/html

# Targets for daily automated doc build
# By default, Sphinx only rebuilds pages where the page content has changed.
# This means it doesn't always pick up changes to preferred link targets, etc
# To ensure such changes are picked up, we build the published docs with
# `-E` (to ignore the cached environment) and `-a` (to ignore already existing
# output files)

# for development releases: always build
autobuild-dev:
make dist SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'
-make suspicious

# for quick rebuilds (HTML only)
autobuild-dev-html:
make html SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'

# for stable releases: only build if not in pre-release stage (alpha, beta)
# release candidate downloads are okay, since the stable tree can be in that stage
Expand Down
9 changes: 9 additions & 0 deletions Misc/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,15 @@ C API
Documentation
-------------

- Issue #30052: the link targets for ``:func:\`bytes\``` and
``:func:\`bytearray\``` are now their respective type definitions, rather
than the corresponding builtin function entries. Use ``:ref:\`func-bytes\```
and ``:ref:\`func-bytes\``` to reference the latter.

In order to ensure this and future cross-reference updates are applied
automatically, the daily documentation builds now disable the default
output caching features in Sphinx.

- bpo-26985: Add missing info of code object in inspect documentation.

- bpo-19824, bpo-20314, bpo-12518: Improve the documentation for, and links
Expand Down

0 comments on commit 3766314

Please sign in to comment.