diff options
| author | Jisi Liu <liujisi@google.com> | 2015-10-06 14:13:01 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2015-10-06 14:13:01 -0700 |
| commit | 878b603d328697a027264c3f195df9b5981a4129 (patch) | |
| tree | af429ac9c51f94bb0078caca3e75b6a590edfb30 /python/tox.ini | |
| parent | 9cafa201224e6699d247e8e8193319303df38a34 (diff) | |
| parent | 5f6a1d3dbbd21b490bd5e429c7582950e29b3198 (diff) | |
| download | protobuf-878b603d328697a027264c3f195df9b5981a4129.tar.gz protobuf-878b603d328697a027264c3f195df9b5981a4129.tar.bz2 protobuf-878b603d328697a027264c3f195df9b5981a4129.zip | |
Merge pull request #849 from pherl/master
Integrate google internal changes.
Diffstat (limited to 'python/tox.ini')
| -rw-r--r-- | python/tox.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/tox.ini b/python/tox.ini index a6352ef4..1c433fa2 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -2,7 +2,8 @@ envlist = # cpp implementation on py34 is currently broken due to # changes introduced by http://bugs.python.org/issue22079. - py{26,27,33,34}-{cpp,python} + # py26 is currently broken due to the json_format + py{27,33,34}-{cpp,python} [testenv] usedevelop=true |