aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-02 12:50:58 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-02 12:50:58 -0800
commit2c921397a322fd5829740965ccd8fcff23f0de9b (patch)
tree310c71625685c8e7b5637dcb8e3c838f3cd7bc72
parent95ef3b2f5ef43d407d2fb69c2bff42e8a6524efa (diff)
parentc48afec9f4bfb33a43c1f236d36305f914d3986c (diff)
Merge pull request #344 from nathanielmanistaatgoogle/issue-334
Install PyPI's protobuf into the Python virtual environment.
-rwxr-xr-xtools/run_tests/build_python.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh
index 46e5797f62..4abb412c95 100755
--- a/tools/run_tests/build_python.sh
+++ b/tools/run_tests/build_python.sh
@@ -7,6 +7,5 @@ cd $(dirname $0)/../..
root=`pwd`
virtualenv python2.7_virtual_environment
-python2.7_virtual_environment/bin/pip install enum34==1.0.4 futures==2.2.0
-python2.7_virtual_environment/bin/pip install third_party/protobuf/python
+python2.7_virtual_environment/bin/pip install enum34==1.0.4 futures==2.2.0 protobuf==2.6.1
python2.7_virtual_environment/bin/pip install src/python