diff options
| author |  Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 20:49:45 -0400 |
|---|---|---|
| committer | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 20:49:45 -0400 |
| commit | 3791c8051a587de347c3aa1c03de79dce38c1a2e (patch) | |
| tree | 37b03986e494555efd2c5ca968d12aed62e7f8c3 /python | |
| parent | 5de2a81b017273c9d91d6a54fc138cf077763730 (diff) | |
Fix travis build
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 | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/python/setup.py b/python/setup.py index 23193cba..f7ee6357 100755 --- a/python/setup.py +++ b/python/setup.py @@ -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') diff --git a/python/tox.ini b/python/tox.ini index ebe75459..d758512d 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -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 |