Skip to content

Commit

Permalink
Merge pull request #1157 from tseaver/bump-protobuf-pin-to-3.0.0a3
Browse files Browse the repository at this point in the history
Bump protobuf pin to 3.0.0a3.
  • Loading branch information
tseaver committed Sep 30, 2015
2 parents 8433bd1 + 493f04a commit b5c6085
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'google-apitools',
'httplib2 >= 0.9.1',
'oauth2client >= 1.4.6',
'protobuf == 3.0.0-alpha-1',
'protobuf >= 3.0.0a3',
'pycrypto',
'six',
]
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ commands =
deps =
nose
unittest2
protobuf==3.0.0-alpha-1
protobuf>=3.0.0a3
setenv =
PYTHONPATH = {toxinidir}/_testing

Expand Down

0 comments on commit b5c6085

Please sign in to comment.