From e2ce00461e73f4f7517ed33717c363c2df99d667 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Fri, 14 Oct 2016 11:02:09 -0700
Subject: [PATCH] Release v1.5.4

---
 CHANGELOG | 10 ++++++++++
 setup.py  |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f2462bed240..83fdd076de0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+v1.5.4
+  Version 1.5.4
+
+  Bugfix release
+
+  - Properly handle errors when the API returns a mapping or sequence. (#289)
+  - Upgrade to unified uritemplate 3.0.0. (#293)
+  - Allow oauth2client 4.0.0, with the caveat that file-based discovery
+    caching is disabled.
+
 v1.5.3
   Version 1.5.3
 
diff --git a/setup.py b/setup.py
index ca8444618de..4a431ac66dd 100644
--- a/setup.py
+++ b/setup.py
@@ -63,10 +63,10 @@ def _DetectBadness():
 ]
 
 install_requires = [
-    'httplib2>=0.8,<1',
-    'oauth2client>=1.5.0,<4.0.0',
-    'six>=1.6.1,<2',
-    'uritemplate>=3.0.0,<4',
+    'httplib2>=0.8,<1dev',
+    'oauth2client>=1.5.0,<5.0.0dev',
+    'six>=1.6.1,<2dev',
+    'uritemplate>=3.0.0,<4dev',
 ]
 
 if sys.version_info < (2, 7):