diff options
| -rwxr-xr-x | python/setup.py | 1 | ||||
| -rw-r--r-- | python/tox.ini | 5 | ||||
| -rwxr-xr-x | travis.sh | 10 |
3 files changed, 6 insertions, 10 deletions
diff --git a/python/setup.py b/python/setup.py index 23193cba..24f0c5b6 100755 --- a/python/setup.py +++ b/python/setup.py @@ -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( diff --git a/python/tox.ini b/python/tox.ini index 24b709ef..4a994b61 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -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 .. } |