From 2982c0a8cd09f19b773df88e8119c8bc3f9b7951 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 3 Mar 2016 23:25:23 -0500
Subject: [PATCH 1/2] Avoid protobuf 3.0.0.b2.post1.

See:
https://github.com/GoogleCloudPlatform/gcloud-python/issues/1570
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 07c0e9d821c5..49609b138e76 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
     'httplib2 >= 0.9.1',
     'googleapis-common-protos',
     'oauth2client >= 2.0.1',
-    'protobuf >= 3.0.0b2',
+    'protobuf >= 3.0.0b2, != 3.0.0.b2.post1',
     'pyOpenSSL',
     'six',
 ]

From f91709b0724aef21c2df8600449e7b14dfbdbf77 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Fri, 4 Mar 2016 14:13:38 -0500
Subject: [PATCH 2/2] Comment out custom py27 tox environment.

grpcio 0.13.0 is broken on UCS2 Python 2.7.
---
 tox.ini | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index d1ef5b69d923..5d403a107143 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,14 +21,17 @@ covercmd =
       --cover-branches \
       --nocapture
 
-[testenv:py27]
-basepython =
-    python2.7
-deps =
-    {[testenv]deps}
-    grpcio >= 0.13.0
-setenv =
-    PYTHONPATH =
+# Until grpcio 0.13.1 ships, this environment is broken on UCS2 builds.
+# See: https://github.com/grpc/grpc/issues/5280 and
+#      https://github.com/grpc/grpc/pull/5319
+#[testenv:py27]
+#basepython =
+#    python2.7
+#deps =
+#    {[testenv]deps}
+#    grpcio >= 0.13.0
+#setenv =
+#    PYTHONPATH =
 
 [testenv:cover]
 basepython =