python · larryhastings · Jul 15, 2017 · Jul 16, 2017 · Jul 16, 2017 · Jul 16, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -42,6 +42,7 @@ matrix:
        # 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 'blurb>=1.0.3'
      script:
        - make check suspicious html SPHINXOPTS="-q -W -j4"
    - os: linux
@@ -109,3 +110,4 @@ notifications:
    on_success: change
    on_failure: always
    skip_join: true
+
diff --git 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)
@@ -38,6 +39,8 @@ help:
 	@echo "  serve      to serve the documentation on the localhost (8000)"

 build:
+	-mkdir -p build
+	$(BLURB) merge -f build/NEWS
 	$(SPHINXBUILD) $(ALLSPHINXOPTS)
 	@echo

@@ -107,7 +110,7 @@ clean:

 venv:
 	$(PYTHON) -m venv venv
-	./venv/bin/python3 -m pip install -U Sphinx
+	./venv/bin/python3 -m pip install -U Sphinx 'blurb>=1.0.3'

 dist:
 	rm -rf dist
@@ -189,3 +192,4 @@ autobuild-stable-html:
 		exit 1;; \
 	esac
 	@make autobuild-dev-html
+
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
@@ -325,9 +325,9 @@ whatsnew/3.5,,:warning,'WARNING:root:warning\n'
 whatsnew/3.5,,::,>>> addr6 = ipaddress.IPv6Address('::1')
 whatsnew/3.5,,:root,ERROR:root:exception
 whatsnew/3.5,,:exception,ERROR:root:exception
-whatsnew/changelog,,:version,import sys; I = version[:version.index(' ')]
 whatsnew/changelog,,:end,str[start:end]
 library/binascii,,`,'`'
 library/uu,,`,'`'
 whatsnew/3.7,,`,'`'
 whatsnew/changelog,,`,'`'
+whatsnew/changelog,3602,:version,I = version[:version.index(' ')]
diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst
@@ -4,4 +4,4 @@
 Changelog
 +++++++++

-.. miscnews:: ../../Misc/NEWS
+.. miscnews:: ../build/NEWS