prepare for version 1.1.4

D-W- · Oct 16, 2013 · 46ee13e · 46ee13e
1 parent e41e4fc
commit 46ee13e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -33,3 +33,9 @@ Version 1.1.2 released 2013-03-26
 Version 1.1.3 released 2013-06-24
 
 * Fix _guess_mime_type(), add refresh_token().
+
+Version 1.1.4 released 2013-10-16
+
+* Add timeout=5.
+* Remove simplejson dependency.
+* Support Python 2.6 / 2.7.
diff --git a/setup.py b/setup.py
@@ -24,7 +24,4 @@
         'Topic :: Software Development :: Libraries :: Python Modules',
     ])
 
-if sys.version_info[1]==5:
-    kw['install_requires'] = ['simplejson']
-
 setup(**kw)