Skip to content

Commit 69391eb

Browse files
committed
Merge pull request #1571 from tseaver/1570-avoid-protobuf-3.0.0b2.post1
Avoid protobuf 3.0.0.b2.post1.
2 parents af2d6d8 + f91709b commit 69391eb

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
'httplib2 >= 0.9.1',
1515
'googleapis-common-protos',
1616
'oauth2client >= 2.0.1',
17-
'protobuf >= 3.0.0b2',
17+
'protobuf >= 3.0.0b2, != 3.0.0.b2.post1',
1818
'pyOpenSSL',
1919
'six',
2020
]

tox.ini

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ covercmd =
2121
--cover-branches \
2222
--nocapture
2323

24-
[testenv:py27]
25-
basepython =
26-
python2.7
27-
deps =
28-
{[testenv]deps}
29-
grpcio >= 0.13.0
30-
setenv =
31-
PYTHONPATH =
24+
# Until grpcio 0.13.1 ships, this environment is broken on UCS2 builds.
25+
# See: https://github.com/grpc/grpc/issues/5280 and
26+
# https://github.com/grpc/grpc/pull/5319
27+
#[testenv:py27]
28+
#basepython =
29+
# python2.7
30+
#deps =
31+
# {[testenv]deps}
32+
# grpcio >= 0.13.0
33+
#setenv =
34+
# PYTHONPATH =
3235

3336
[testenv:cover]
3437
basepython =

0 commit comments

Comments
 (0)