diff options
| author | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 18:19:56 -0400 |
|---|---|---|
| committer | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 18:19:56 -0400 |
| commit | 5de2a81b017273c9d91d6a54fc138cf077763730 (patch) | |
| tree | f09a66570fa9bf724b6eb6b1f1481bc788c19b0a /python | |
| parent | afa488c4d10a06730d7a16a8eda4935a06ea965d (diff) | |
| download | protobuf-5de2a81b017273c9d91d6a54fc138cf077763730.tar.gz protobuf-5de2a81b017273c9d91d6a54fc138cf077763730.tar.bz2 protobuf-5de2a81b017273c9d91d6a54fc138cf077763730.zip | |
Improve tox.ini, install py26 for travis.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'python')
| -rw-r--r-- | python/tox.ini | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/python/tox.ini b/python/tox.ini index 4a994b61..ebe75459 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -2,17 +2,20 @@ envlist = # Py3 tests currently fail because of text handling issues, # So only test py26/py27 for now. - #py26,py27,py33,py34 - py26,py27 + #py{26,27,33,34}-{cpp,python} + py{26,27}-{cpp,python} [testenv] -usedevelop = true setenv = - LD_LIBRARY_PATH={toxinidir}/../src/.libs + cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs + cpp: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp commands = python setup.py -q build_py - python setup.py -q build {posargs} - python setup.py -q test -q {posargs} - pip install --install-option {posargs: -q} . + python: python setup.py -q build + cpp: python setup.py -q build --cpp_implementation + python: python setup.py -q test -q + cpp: python setup.py -q test -q --cpp_implementation deps = six + py26: ordereddict + py26: unittest2 |