Skip to content

P
protobuf
Commit 3791c805 authored by Dan O'Reilly's avatar Dan O'Reilly
Browse files
Options

Fix travis build 

Signed-off-by: 's avatarDan O'Reilly <oreilldf@gmail.com>
parent 5de2a81b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
python/setup.py
View file @ 3791c805
...@@ -146,6 +146,7 @@ if __name__ == '__main__': ...@@ -146,6 +146,7 @@ if __name__ == '__main__':
) )
os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp' os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'
# Keep this list of dependencies in sync with tox.ini.
install_requires = ['six', 'setuptools'] install_requires = ['six', 'setuptools']
if sys.version_info <= (2,7): if sys.version_info <= (2,7):
install_requires.append('ordereddict') install_requires.append('ordereddict')
......
python/tox.ini
View file @ 3791c805
...@@ -6,6 +6,7 @@ envlist = ...@@ -6,6 +6,7 @@ envlist =
py{26,27}-{cpp,python} py{26,27}-{cpp,python}
[testenv] [testenv]
usedevelop=true
setenv = setenv =
cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs
cpp: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp cpp: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
...@@ -16,6 +17,7 @@ commands = ...@@ -16,6 +17,7 @@ commands =
python: python setup.py -q test -q python: python setup.py -q test -q
cpp: python setup.py -q test -q --cpp_implementation cpp: python setup.py -q test -q --cpp_implementation
deps = deps =
# Keep this list of dependencies in sync with setup.py.
six six
py26: ordereddict py26: ordereddict
py26: unittest2 py26: unittest2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment