diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-26 15:47:35 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-26 15:47:35 -0700 |
| commit | e94e062b589cfc1c5d486ec4470af104e102232b (patch) | |
| tree | 42501d8c22cd93f77ba4bf0434dc6e7553794bdf /python/tox.ini | |
| parent | fecc3d5963ed74337504953c98f288dfa0b024a8 (diff) | |
| parent | c7a1f8ec3b7ab4f6763e4d5c2663ad39e13a6aa0 (diff) | |
| download | protobuf-e94e062b589cfc1c5d486ec4470af104e102232b.tar.gz protobuf-e94e062b589cfc1c5d486ec4470af104e102232b.tar.bz2 protobuf-e94e062b589cfc1c5d486ec4470af104e102232b.zip | |
Merge branch 'master' of github.com:google/protobuf into beta-1
Diffstat (limited to 'python/tox.ini')
| -rw-r--r-- | python/tox.ini | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/tox.ini b/python/tox.ini index 9a934d0a..d0100758 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,9 +1,9 @@ [tox] envlist = - # Py3 tests currently fail because of text handling issues, - # So only test py26/py27 for now. + # cpp implementation on py34 is currently broken due to + # changes introduced by http://bugs.python.org/issue22079. #py{26,27,33,34}-{cpp,python} - py{26,27}-{cpp,python} + py{26,27,33}-{cpp,python}, py34-{python} [testenv] usedevelop=true |