Bump to 1.5.4 final

CHANGES

@@ -1,11 +1,5 @@
-Release 1.5.4 (in development)
-==============================
-
-Incompatible changes
---------------------
-
-Deprecated
-----------
+Release 1.5.4 (released Apr 02, 2017)
+=====================================
 
 Features added
 --------------
@@ -37,9 +31,6 @@ Bugs fixed
 * A LaTeX command such as ``\\large`` inserted in the title items of
   :confval:`latex_documents` causes failed PDF build (refs #3551, #3567)
 
-Testing
---------
-
 Release 1.5.3 (released Feb 26, 2017)
 =====================================
 

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.4+'
+__version__ = '1.5.4'
 __released__ = '1.5.4'  # 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, 4, 'beta', 0)
+version_info = (1, 5, 4, 'final', 0)
 
 package_dir = path.abspath(path.dirname(__file__))