Merge branch 'stable'

This commit is contained in:
Takeshi KOMIYA 2017-01-22 17:36:03 +09:00
commit fd2b3ec529
2 changed files with 21 additions and 3 deletions

22
CHANGES
View File

@ -58,8 +58,26 @@ Deprecated
* ``Sphinx.status_iterator()` and ``Sphinx.old_status_iterator()`` is now * ``Sphinx.status_iterator()` and ``Sphinx.old_status_iterator()`` is now
deprecated. Please use ``sphinx.util:status_iterator()`` intead. deprecated. Please use ``sphinx.util:status_iterator()`` intead.
Release 1.5.2 (in development) Release 1.5.3 (in development)
=============================== ==============================
Incompatible changes
--------------------
Deprecated
----------
Features added
--------------
Bugs fixed
----------
Testing
--------
Release 1.5.2 (released Jan 22, 2017)
=====================================
Incompatible changes Incompatible changes
-------------------- --------------------

View File

@ -15,7 +15,7 @@ Release checklist
* `make clean` * `make clean`
* `python setup.py compile_grammar` * `python setup.py compile_grammar`
* `python setup.py release bdist_wheel sdist upload --identity=[your key]` * `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 * `git tag x.y.z` with version number
* Merge default into stable if final major release * Merge default into stable if final major release
* `git push origin stable --tags` * `git push origin stable --tags`