Use tox in travis build. Tweak tox.ini

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
pull/722/head
Dan O'Reilly 9 years ago
parent de22561b7b
commit 416f001adc
  1. 1
      python/setup.py
  2. 5
      python/tox.ini
  3. 10
      travis.sh

@ -132,6 +132,7 @@ if __name__ == '__main__':
ext_module_list = []
cpp_impl = '--cpp_implementation'
if cpp_impl in sys.argv:
print("YYYYYYYYYYYYYYYYYYYYYYYY")
sys.argv.remove(cpp_impl)
# C++ implementation extension
ext_module_list.append(

@ -10,8 +10,9 @@ usedevelop = true
setenv =
LD_LIBRARY_PATH={toxinidir}/../src/.libs
commands =
python setup.py -q --cpp_implementation develop
python setup.py build_py
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} .
deps =
six

@ -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 ..
}

Loading…
Cancel
Save