From 502874bcc43916e74b1c9091874e6418d130ed35 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 2 Oct 2016 00:25:58 +0900 Subject: [PATCH 1/4] Fix "make clean" does not remove build/ directory --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index adaf9640f..fa2a846f5 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ all: clean-pyc clean-backupfiles style-check test style-check: @$(PYTHON) utils/check_sources.py $(DONT_CHECK) . -clean: clean-pyc clean-pycache clean-patchfiles clean-backupfiles clean-generated clean-testfiles +clean: clean-pyc clean-pycache clean-patchfiles clean-backupfiles clean-generated clean-testfiles clean-buildfiles clean-pyc: find . -name '*.pyc' -exec rm -f {} + @@ -58,6 +58,9 @@ clean-testfiles: rm -rf tests/build rm -rf .tox/ +clean-buildfiles: + rm -rf build + pylint: @pylint --rcfile utils/pylintrc sphinx From fc45d4d5fe14f1e45046f41ca21124c9280eee00 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 2 Oct 2016 00:36:42 +0900 Subject: [PATCH 2/4] Update CHANGES --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index 59cbefe3b..b5bb7513d 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,8 @@ Release 1.4.8 (in development) Bugs fixed ---------- +* #2996: The wheel package of Sphinx got crash with ImportError + Release 1.4.7 (released Oct 1, 2016) ==================================== From 007c855c9c6fe39f5197571a0c34b7caa3c881e4 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 2 Oct 2016 00:37:59 +0900 Subject: [PATCH 3/4] Bump to 1.4.8 final --- CHANGES | 4 ++-- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index b5bb7513d..a8552e809 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 1.4.8 (in development) -============================== +Release 1.4.8 (released Oct 1, 2016) +==================================== Bugs fixed ---------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index b7956c68e..228565fb7 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.4.8+' +__version__ = '1.4.8' __released__ = '1.4.8' # used when Sphinx builds its own docs # version info for better programmatic use # possible values for 3rd element: 'alpha', 'beta', 'rc', 'final' # 'final' has 0 as the last element -version_info = (1, 4, 8, 'beta', 1) +version_info = (1, 4, 8, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 55a8ab3bbbad02b227582f5a48b5893ac758060e Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 2 Oct 2016 00:43:32 +0900 Subject: [PATCH 4/4] Bump version --- CHANGES | 6 ++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index a8552e809..41f0055df 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +Release 1.4.9 (in development) +============================== + +Bugs fixed +---------- + Release 1.4.8 (released Oct 1, 2016) ==================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 228565fb7..60b42d70e 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.4.8' -__released__ = '1.4.8' # used when Sphinx builds its own docs +__version__ = '1.4.9+' +__released__ = '1.4.9' # used when Sphinx builds its own docs # version info for better programmatic use # possible values for 3rd element: 'alpha', 'beta', 'rc', 'final' # 'final' has 0 as the last element -version_info = (1, 4, 8, 'final', 0) +version_info = (1, 4, 9, 'beta', 1) package_dir = path.abspath(path.dirname(__file__))