From 5868552ad5c0acdd1f12b270e7322efe86d74871 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 4 Sep 2017 15:29:34 -0700 Subject: [PATCH 1/3] Doc/Makefile needs to use blurb now --- Doc/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Doc/Makefile b/Doc/Makefile index 526269d1e19d9e..850afc538eaf5e 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -38,6 +38,20 @@ help: @echo " serve to serve the documentation on the localhost (8000)" build: + -mkdir -p build +# Look first for a Misc/NEWS file (building from a source release tarball +# or old repo) and use that, otherwise look for a Misc/NEWS.d directory +# (building from a newer repo) and use blurb to generate the NEWS file. + @if [ -f ../Misc/NEWS ] ; then \ + echo "Using existing Misc/NEWS file"; \ + cp ../Misc/NEWS build/NEWS; \ + elif [ -d ../Misc/NEWS.d ]; then \ + echo "Building NEWS from Misc/NEWS.d with blurb"; \ + $(BLURB) merge -f build/NEWS; \ + else \ + echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \ + exit 1; \ + fi $(SPHINXBUILD) $(ALLSPHINXOPTS) @echo From 0afbf777af1e24ea9a972f64c1af220783dcac91 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 4 Sep 2017 15:35:29 -0700 Subject: [PATCH 2/3] install blurb in Doc venv --- Doc/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/Makefile b/Doc/Makefile index 850afc538eaf5e..63bbe1d4d71450 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -6,6 +6,7 @@ # You can set these variables from the command line. PYTHON = python3 SPHINXBUILD = sphinx-build +BLURB = $(PYTHON) -m blurb PAPER = SOURCES = DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py) @@ -121,7 +122,7 @@ clean: venv: $(PYTHON) -m venv venv - ./venv/bin/python3 -m pip install -U Sphinx + ./venv/bin/python3 -m pip install -U Sphinx blurb dist: rm -rf dist From 525cafec0b4f2eb3aeb6903b67e0fd0c3d584e2d Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 4 Sep 2017 16:53:13 -0700 Subject: [PATCH 3/3] The rest of the blub changes from 3.5 --- .travis.yml | 2 +- Doc/whatsnew/changelog.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57b4c08a3e78e2..2515d6416a7f25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: - cd Doc # Sphinx is pinned so that new versions that introduce new warnings won't suddenly cause build failures. # (Updating the version is fine as long as no warnings are raised by doing so.) - - python -m pip install sphinx~=1.6.1 + - python -m pip install sphinx~=1.6.1 blurb script: - make check suspicious html SPHINXOPTS="-q -W -j4" - os: linux diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst index 67a12f3374fc56..b4356143659031 100644 --- a/Doc/whatsnew/changelog.rst +++ b/Doc/whatsnew/changelog.rst @@ -4,4 +4,4 @@ Changelog +++++++++ -.. miscnews:: ../../Misc/NEWS +.. miscnews:: ../build/NEWS