diff options
| author |  Jakob Buchgraber <buchgr@google.com> | 2017-04-14 21:16:19 +0200 |
|---|---|---|
| committer | Jakob Buchgraber <buchgr@google.com> | 2017-04-14 21:16:19 +0200 |
| commit | 8ff0d0d436b4fd9fd4199d313f708377c7a668af (patch) | |
| tree | 1d0060d271adb3d6bac605c2a10768be80e09203 /third_party/protobuf/python/tox.ini | |
| parent | 5235d06159ba6fee412bee261ea7867d061252b0 (diff) | |
Revert "protobuf: Update protobuf to @laszlocsomor's master at commit 421d909."
This reverts commit 5235d06159ba6fee412bee261ea7867d061252b0.
Unfortunately, we noticed several build errors / test failures internally due this
change.
Diffstat (limited to 'third_party/protobuf/python/tox.ini')
| -rw-r--r-- | third_party/protobuf/python/tox.ini | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/third_party/protobuf/python/tox.ini b/third_party/protobuf/python/tox.ini deleted file mode 100644 index 1600db21fc..0000000000 --- a/third_party/protobuf/python/tox.ini +++ /dev/null @@ -1,24 +0,0 @@ -[tox] -envlist = - py{26,27,33,34}-{cpp,python} - -[testenv] -usedevelop=true -passenv = CC -setenv = - cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs - cpp: DYLD_LIBRARY_PATH={toxinidir}/../src/.libs - cpp: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp -commands = - python setup.py -q build_py - python: python setup.py -q build - cpp: python setup.py -q build --cpp_implementation --warnings_as_errors --compile_static_extension - python: python setup.py -q test -q - cpp: python setup.py -q test -q --cpp_implementation - python: python setup.py -q test_conformance - cpp: python setup.py -q test_conformance --cpp_implementation -deps = - # Keep this list of dependencies in sync with setup.py. - six>=1.9 - py26: ordereddict - py26: unittest2 |