From be686a06106ee432eeafab3c57bef8c17c0ba16a Mon Sep 17 00:00:00 2001 From: Mariatta Date: Tue, 16 May 2017 10:53:59 -0700 Subject: [PATCH 1/5] bpo-30380: use sphinx~=1.5.6 --- Doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/Makefile b/Doc/Makefile index 94697f95671894..c2f7e7f62db8e5 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -107,7 +107,7 @@ clean: venv: $(PYTHON) -m venv venv - ./venv/bin/python3 -m pip install -U Sphinx + ./venv/bin/python3 -m pip install sphinx~=1.5.6 dist: rm -rf dist From 6dcd1d5fe49f3e11049940328a8b23d7dfcd3c77 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 16 May 2017 12:21:53 -0700 Subject: [PATCH 2/5] Pin Sphinx to ~=1.5.6 in .travis.yml --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2062e81bea9e9d..0d4faf4fc96c18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,11 @@ matrix: - TESTING=docs before_script: - cd Doc - - make venv + # 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.5.6 script: - - make check suspicious html PYTHON="./venv/bin/python" SPHINXBUILD="./venv/bin/python -m sphinx" SPHINXOPTS="-q -W" + - make check suspicious html SPHINXOPTS="-q -W" - os: linux language: c compiler: gcc From dbe6e4f972456eba1861d688eb3d016cc29c67ba Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 16 May 2017 13:29:54 -0700 Subject: [PATCH 3/5] Revert change to the Doc Makefile --- Doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/Makefile b/Doc/Makefile index c2f7e7f62db8e5..ef066006f9f047 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -107,7 +107,7 @@ clean: venv: $(PYTHON) -m venv venv - ./venv/bin/python3 -m pip install sphinx~=1.5.6 + ./venv/bin/python3 -m pip install -U sphinx dist: rm -rf dist From 39c83e3485de0a84d07369e279c2d87a8a3f0834 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 16 May 2017 13:30:20 -0700 Subject: [PATCH 4/5] Really revert the Doc Makefile change --- Doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/Makefile b/Doc/Makefile index ef066006f9f047..94697f95671894 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -107,7 +107,7 @@ clean: venv: $(PYTHON) -m venv venv - ./venv/bin/python3 -m pip install -U sphinx + ./venv/bin/python3 -m pip install -U Sphinx dist: rm -rf dist From df2cbb18d7c0e85ad6011817ddcafb455c891497 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 16 May 2017 13:32:43 -0700 Subject: [PATCH 5/5] Pin to Sphinx 1.6.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0d4faf4fc96c18..c4a21499749829 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.5.6 + - python -m pip install sphinx~=1.6.1 script: - make check suspicious html SPHINXOPTS="-q -W" - os: linux