From b1a3ff61b7837423f85e2bf488d12c766ce4d0b5 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 22 Jan 2017 17:24:32 +0900 Subject: [PATCH 1/3] Bump to 1.5.2 final --- CHANGES | 4 ++-- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index f17129934..4bca0f827 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 1.5.2 (in development) -=============================== +Release 1.5.2 (released Jan 22, 2017) +===================================== Incompatible changes -------------------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 2cd3a57de..dd4feb6ef 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -30,13 +30,13 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '1.5.2+' +__version__ = '1.5.2' __released__ = '1.5.2' # 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, 5, 2, 'beta', 1) +version_info = (1, 5, 2, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From f3135280e3b00c127b43c5c27e8a4ce465355aed Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 22 Jan 2017 17:29:47 +0900 Subject: [PATCH 2/3] Bump version --- CHANGES | 18 ++++++++++++++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 4bca0f827..c843d9f4f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,21 @@ +Release 1.5.3 (in development) +============================== + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 1.5.2 (released Jan 22, 2017) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index dd4feb6ef..e49d3d0be 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -30,13 +30,13 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '1.5.2' -__released__ = '1.5.2' # used when Sphinx builds its own docs +__version__ = '1.5.3+' +__released__ = '1.5.3' # 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, 5, 2, 'final', 0) +version_info = (1, 5, 3, 'beta', 0) package_dir = path.abspath(path.dirname(__file__)) From 2c91a5241856759cdc7697f26c99738c21840672 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 22 Jan 2017 17:30:07 +0900 Subject: [PATCH 3/3] Update release-checklist --- utils/release-checklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/release-checklist b/utils/release-checklist index 610ab9d19..e8f716acd 100644 --- a/utils/release-checklist +++ b/utils/release-checklist @@ -15,7 +15,7 @@ Release checklist * `make clean` * `python setup.py compile_grammar` * `python setup.py release bdist_wheel sdist upload --identity=[your key]` -* Check PyPI release page for obvious errors +* open https://pypi.python.org/pypi/Sphinx and check there are no obvious errors * `git tag x.y.z` with version number * Merge default into stable if final major release * `git push origin stable --tags`