summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES16
-rw-r--r--sphinx/__init__.py4
2 files changed, 4 insertions, 16 deletions
diff --git a/CHANGES b/CHANGES
index db12b571a..07bef0caa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,5 @@
-Release 3.1.2 (in development)
-==============================
-
-Dependencies
-------------
+Release 3.1.2 (released Jul 05, 2020)
+=====================================
Incompatible changes
--------------------
@@ -10,12 +7,6 @@ Incompatible changes
* #7650: autodoc: the signature of base function will be shown for decorated
functions, not a signature of decorator
-Deprecated
-----------
-
-Features added
---------------
-
Bugs fixed
----------
@@ -34,9 +25,6 @@ Bugs fixed
* #7838: html theme: List items have extra vertical space
* #7878: html theme: Undesired interaction between "overflow" and "float"
-Testing
---------
-
Release 3.1.1 (released Jun 14, 2020)
=====================================
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index b513a1df5..912fa5347 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -32,7 +32,7 @@ if 'PYTHONWARNINGS' not in os.environ:
warnings.filterwarnings('ignore', "'U' mode is deprecated",
DeprecationWarning, module='docutils.io')
-__version__ = '3.1.2+'
+__version__ = '3.1.2'
__released__ = '3.1.2' # used when Sphinx builds its own docs
#: Version info for better programmatic use.
@@ -43,7 +43,7 @@ __released__ = '3.1.2' # used when Sphinx builds its own docs
#:
#: .. versionadded:: 1.2
#: Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (3, 1, 2, 'beta', 0)
+version_info = (3, 1, 2, 'final', 0)
package_dir = path.abspath(path.dirname(__file__))