Merge pull request #1571 from tseaver/1570-avoid-protobuf-3.0.0b2.post1

Avoid protobuf 3.0.0.b2.post1.
googleapis · Mar 4, 2016 · 69391eb · 69391eb
2 parents af2d6d8 + f91709b
commit 69391eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git 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',
 ]

diff --git 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 =