Version bump to v1.2.0

[skip ci]
msiemens · Jun 19, 2014 · 429b648 · 429b648
1 parent 5b7fcb9
commit 429b648
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/README.rst b/README.rst
@@ -141,6 +141,11 @@ see `semver.org <http://semver.org/>`_
 Changelog
 ---------
 
+**v1.2.0** (2014-06-19)
+^^^^^^^^^^^^^^^^^^^^^^^
+
+- Added ``update`` method (see `Issue #6 <https://github.com/msiemens/tinydb/issues/6>`_).
+
 **v1.1.1** (2014-06-14)
 ^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -7,6 +7,11 @@ Version Numbering
 TinyDB follows the SemVer versioning guidelines. For more information,
 see `semver.org <http://semver.org/>`_
 
+**v1.2.0** (2014-06-19)
+^^^^^^^^^^^^^^^^^^^^^^^
+
+- Added ``update`` method (see `Issue #6 <https://github.com/msiemens/tinydb/issues/6>`_).
+
 **v1.1.1** (2014-06-14)
 ^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -45,11 +45,6 @@
 project = u'TinyDB'
 copyright = u'2014, Markus Siemens'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name="tinydb",
-    version="1.1.1",
+    version="1.2.0",
     packages=find_packages(),
 
     # development metadata