Merge branch 'release-1.4.1'

piskvorky · May 15, 2016 · 9677a5f · 9677a5f
2 parents a45499c + 0fc5f20
commit 9677a5f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -0,0 +1,19 @@
+Changes
+=======
+
+1.4.1, 15/05/2016
+* Read-only mode (@nrhine1, #37)
+* Check file exists before deleting (@adibo, #39)
+* AttributeError after SqliteDict is closed (@guyskk, #40)
+* Python 3.5 support (@jtatum, #47)
+* Pickle when updating with 2-tuples seq (@Digenis, #49)
+* Fix exit errors: TypeError("'NoneType' object is not callable",) (@janrygl, #45)
+
+1.4.0
+* fix regression where iterating over keys/values/items returned a full list instead of iterator
+
+1.3.0
+* improve error handling in multithreading (PR #28); 100% test coverage.
+
+1.2.0
+* full python 3 support, continuous testing via Travis CI.
diff --git a/README.rst b/README.rst
@@ -118,14 +118,6 @@ Comments, bug reports
 ``sqlitedict`` resides on `github <https://github.com/piskvorky/sqlitedict>`_. You can file
 issues or pull requests there.
 
-History
--------
-
-**1.4.0**: fix regression where iterating over keys/values/items returned a full list instead of iterator
-
-**1.3.0**: improve error handling in multithreading (`PR #28 <https://github.com/piskvorky/sqlitedict/pull/28>`_); 100% test coverage.
-
-**1.2.0**: full python 3 support, continuous testing via `Travis CI <https://travis-ci.org/piskvorky/sqlitedict>`_.
 
 ----