summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2019-06-02 21:16:14 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2019-06-02 21:16:14 +0900
commitbcc0ffbd18fcc4d5bbd5b18e94cd1e3ef50e6a26 (patch)
treec14794cf72aa6e01383590e5a0fd6304652ca654
parent3360f2461c02ee4cfd351e1e3264edae55d1297a (diff)
downloadsphinx-git-bcc0ffbd18fcc4d5bbd5b18e94cd1e3ef50e6a26.tar.gz
Bump version
-rw-r--r--CHANGES21
-rw-r--r--sphinx/__init__.py6
2 files changed, 24 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index b82a191ea..07846fede 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,24 @@
+Release 2.2.0 (in development)
+==============================
+
+Dependencies
+------------
+
+Incompatible changes
+--------------------
+
+Deprecated
+----------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Testing
+--------
+
Release 2.1.1 (in development)
==============================
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 8a6bdcc8b..57b3d6062 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__ = '2.1.1+'
-__released__ = '2.1.1' # used when Sphinx builds its own docs
+__version__ = '2.2.0+'
+__released__ = '2.2.0' # used when Sphinx builds its own docs
#: Version info for better programmatic use.
#:
@@ -43,7 +43,7 @@ __released__ = '2.1.1' # used when Sphinx builds its own docs
#:
#: .. versionadded:: 1.2
#: Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (2, 1, 1, 'beta', 0)
+version_info = (2, 2, 0, 'beta', 0)
package_dir = path.abspath(path.dirname(__file__))