Merge pull request #857 from tseaver/pin-protobuf-3.0.0-alpha-1

Pin 'protobuf==3.0.0-alpha-1'.
googleapis · May 2, 2015 · 8b5c5b9 · 8b5c5b9
2 parents 8b6b4a2 + c39a34e
commit 8b5c5b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
     'google-apitools',
     'httplib2 >= 0.9.1',
     'oauth2client >= 1.4.6',
-    'protobuf >= 2.5.0',
+    'protobuf == 3.0.0-alpha-1',
     'pycrypto',
     'pytz',
     'six',

diff --git a/tox.ini b/tox.ini
@@ -10,7 +10,7 @@ commands =
 deps =
     nose
     unittest2
-    protobuf>=3.0.0-alpha-1
+    protobuf==3.0.0-alpha-1
 
 [testenv:cover]
 basepython =
@@ -54,7 +54,7 @@ deps =
     pep8
     pylint
     unittest2
-    protobuf>=3.0.0-alpha-1
+    protobuf==3.0.0-alpha-1
 
 [testenv:regression]
 basepython =