diff options
author | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 15:29:10 -0400 |
---|---|---|
committer | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 15:29:10 -0400 |
commit | 416f001adca9d3b2247a21630e4a71ec6e8d14e9 (patch) | |
tree | 6110200a5893ef99e879760b44ecaf85bc49fe4b /travis.sh | |
parent | de22561b7b34dcf68bdf09a52df3959bed697c14 (diff) | |
download | protobuf-416f001adca9d3b2247a21630e4a71ec6e8d14e9.tar.gz protobuf-416f001adca9d3b2247a21630e4a71ec6e8d14e9.tar.bz2 protobuf-416f001adca9d3b2247a21630e4a71ec6e8d14e9.zip |
Use tox in travis build. Tweak tox.ini
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -114,10 +114,7 @@ build_javanano_oracle7() { build_python() { internal_build_cpp cd python - python setup.py build - python setup.py test - python setup.py sdist - sudo pip install virtualenv && virtualenv /tmp/protoenv && /tmp/protoenv/bin/pip install dist/* + tox cd .. } @@ -126,10 +123,7 @@ build_python_cpp() { export LD_LIBRARY_PATH=../src/.libs # for Linux export DYLD_LIBRARY_PATH=../src/.libs # for OS X cd python - python setup.py build --cpp_implementation - python setup.py test --cpp_implementation - python setup.py sdist --cpp_implementation - sudo pip install virtualenv && virtualenv /tmp/protoenv && /tmp/protoenv/bin/pip install dist/* + tox -- --cpp_implementation cd .. } |