Fix travis build

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
pull/722/head
Dan O'Reilly 10 years ago
parent 5de2a81b01
commit 3791c8051a
  1. 1
      python/setup.py
  2. 2
      python/tox.ini

@ -146,6 +146,7 @@ if __name__ == '__main__':
)
os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'
# Keep this list of dependencies in sync with tox.ini.
install_requires = ['six', 'setuptools']
if sys.version_info <= (2,7):
install_requires.append('ordereddict')

@ -6,6 +6,7 @@ envlist =
py{26,27}-{cpp,python}
[testenv]
usedevelop=true
setenv =
cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs
cpp: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
@ -16,6 +17,7 @@ commands =
python: python setup.py -q test -q
cpp: python setup.py -q test -q --cpp_implementation
deps =
# Keep this list of dependencies in sync with setup.py.
six
py26: ordereddict
py26: unittest2

Loading…
Cancel
Save