diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2015-09-04 10:12:49 +0200 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2015-09-04 10:12:49 +0200 |
| commit | 4cb0edd7782659eddb5dd3791a330ff117799be5 (patch) | |
| tree | a361c4a47f41ca877ee6051f89ab76992581a539 /python/tox.ini | |
| parent | 63eca470fd1a8372bab3710dde5bb2a41ee91219 (diff) | |
| parent | d9598ca55db13bcbc8c748ed7a517f12a069962a (diff) | |
| download | protobuf-4cb0edd7782659eddb5dd3791a330ff117799be5.tar.gz protobuf-4cb0edd7782659eddb5dd3791a330ff117799be5.tar.bz2 protobuf-4cb0edd7782659eddb5dd3791a330ff117799be5.zip | |
Merge pull request #772 from dano/fix_scalar_map
Fix Python 3.4 cpp implementation
Diffstat (limited to 'python/tox.ini')
| -rw-r--r-- | python/tox.ini | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/tox.ini b/python/tox.ini index d0100758..a6352ef4 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -2,8 +2,7 @@ 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} - py{26,27,33}-{cpp,python}, py34-{python} + py{26,27,33,34}-{cpp,python} [testenv] usedevelop=true |