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 /python | |
| 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 'python')
| -rwxr-xr-x | python/setup.py | 1 | ||||
| -rw-r--r-- | python/tox.ini | 5 |
2 files changed, 4 insertions, 2 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 |