Merge branch 'disable_test_with_py310' into 3.5.x

2 files changed, 18 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index e8acb14a8..b7cb2554a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,9 @@
-Release 3.5.4 (in development)
+Release 3.5.5 (in development)
 ==============================
 
 Dependencies
 ------------
 
-* #9071: Restrict docutils to 0.16
-
 Incompatible changes
 --------------------
 
@@ -18,6 +16,20 @@ Features added
 Bugs fixed
 ----------
 
+Testing
+--------
+
+Release 3.5.4 (released Apr 11, 2021)
+=====================================
+
+Dependencies
+------------
+
+* #9071: Restrict docutils to 0.16
+
+Bugs fixed
+----------
+
 * #9078: autodoc: Async staticmethods and classmethods are considered as non
   async coroutine-functions with Python3.10
 * #8870, #9001, #9051: html theme: The style are not applied with docutils-0.17
@@ -26,9 +38,6 @@ Bugs fixed
   - The content of ``sidebar`` directive
   - figures
 
-Testing
---------
-
 Release 3.5.3 (released Mar 20, 2021)
 =====================================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index e72c9f81c..5a4c931e7 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -32,8 +32,8 @@ if 'PYTHONWARNINGS' not in os.environ:
 warnings.filterwarnings('ignore', "'U' mode is deprecated",
                         DeprecationWarning, module='docutils.io')
 
-__version__ = '3.5.4+'
-__released__ = '3.5.4'  # used when Sphinx builds its own docs
+__version__ = '3.5.5+'
+__released__ = '3.5.5'  # used when Sphinx builds its own docs
 
 #: Version info for better programmatic use.
 #:
@@ -43,7 +43,7 @@ __released__ = '3.5.4'  # used when Sphinx builds its own docs
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (3, 5, 4, 'beta', 0)
+version_info = (3, 5, 5, 'final', 0)
 
 package_dir = path.abspath(path.dirname(__file__))