IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
jfbu 2016-12-14 17:48:23 +01:00
commit 9afebd7b3b
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -28,6 +28,8 @@ Release 1.5.2 (in development)
Features added
--------------
* #3241: emit latex warning if buggy titlesec (ref #3210)
Bugs fixed
----------

4
README.rst
View File

@ -36,8 +36,10 @@ Install from cloned source as editable::
Release signatures
==================
Releases are signed with `498D6B9E <https://pgp.mit.edu/pks/lookup?op=vindex&search=0x102C2C17498D6B9E>`_
Releases are signed with following keys:
* `498D6B9E <https://pgp.mit.edu/pks/lookup?op=vindex&search=0x102C2C17498D6B9E>`_
* `5EBA0E07 <https://pgp.mit.edu/pks/lookup?op=vindex&search=0x1425F8CE5EBA0E07>`_
Reading the docs
================

7
sphinx/texinputs/sphinx.sty
View File

@ -6,7 +6,7 @@
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sphinx}[2016/12/11 v1.5.1 LaTeX package (Sphinx markup)]
\ProvidesPackage{sphinx}[2016/12/14 v1.5.2 LaTeX package (Sphinx markup)]
% we delay handling of options to after having loaded packages, because
% of the need to use \definecolor.
@ -18,6 +18,11 @@
\RequirePackage{amstext}
\RequirePackage{textcomp}
\RequirePackage{titlesec}
\AtBeginDocument{\@ifpackagelater{titlesec}{2016/03/15}%
{\@ifpackagelater{titlesec}{2016/03/21}{}%
{\AtEndDocument{\PackageWarningNoLine{sphinx}{^^J%
******** ERROR !! PLEASE UPDATE titlesec.sty !!********^^J%
******** THIS VERSION SWALLOWS SECTION NUMBERS.********}}}}{}}
\RequirePackage{tabulary}
\RequirePackage{makeidx}
% For framing code-blocks and warning type notices, and shadowing topics

15
utils/release-checklist
View File

@ -1,11 +1,14 @@
Release checklist
=================
* Open https://travis-ci.org/sphinx-doc/sphinx/branches and check stable branch is green
* open https://travis-ci.org/sphinx-doc/sphinx/branches and check stable branch is green
* Check `git status`
* Run `make style-check`
* Run `tx pull -a -f` in sphinx/locale if final major release
* Run `python setup.py compile_catalog` in project root after 'tx pull'
* if final major release ...
* Run `(cd sphinx/locale; tx pull -a -f)`
* Run `python setup.py compile_catalog`
* Update version info in sphinx/__init__.py
* Update release date in CHANGES
* `git commit -am 'Bump to x.y.z final'`
@ -13,12 +16,11 @@ Release checklist
* `python setup.py compile_grammar`
* `python setup.py release bdist_wheel sdist upload --identity=[your key]`
* Check PyPI release page for obvious errors
* `git tag` with version number
* `git tag x.y.z` with version number
* Merge default into stable if final major release
* `git push origin stable --tags`
* Open https://readthedocs.org/dashboard/sphinx/versions/ and enable the released version
* open https://readthedocs.org/dashboard/sphinx/versions/ and enable the released version
* Add new version/milestone to tracker categories
* Write announcement and send to sphinx-dev, sphinx-users and python-announce
* Update version info, add new CHANGES entry for next version
* `git commit -am 'Bump version'`
* `git push origin stable`
@ -26,3 +28,4 @@ Release checklist
* `git merge stable`
* `git push origin master`
* Update `sphinx-doc-translations <https://github.com/sphinx-doc/sphinx-doc-translations>`_
* Write announcement and send to sphinx-dev, sphinx-users and python-announce