Reverting protobuf install to 3.0.0-alpha-1 to be compatible

with the one grpc installs. Adding a couple extra libraries
so later on we can switch to using them.

Dockerfile

@@ -18,6 +18,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python-dev \
     python-mysqldb \
     python-software-properties \
+    python-pip \
+    python-virtualenv \
     unzip \
     && rm -rf /var/lib/apt/lists/*
 

bootstrap.sh

@@ -55,9 +55,9 @@ else
   mkdir -p $protobuf_dist/lib/python2.7/site-packages
   export PYTHONPATH=$(prepend_path $PYTHONPATH $protobuf_dist/lib/python2.7/site-packages)
   (cd $protobuf_dist && \
-    wget https://github.com/google/protobuf/archive/v3.0.0-alpha-2.zip && \
-    unzip v3.0.0-alpha-2.zip && \
-    cd protobuf-3.0.0-alpha-2 && \
+    wget https://github.com/google/protobuf/archive/v3.0.0-alpha-1.zip && \
+    unzip v3.0.0-alpha-1.zip && \
+    cd protobuf-3.0.0-alpha-1 && \
     ./autogen.sh && \
     ./configure --prefix=$protobuf_dist && \
     make -j 4 && \
@@ -92,6 +92,16 @@ else
   fi
 fi
 
+# The python install lines should really be:
+# (and require python-pip and python-virtualenv)
+#
+# ./tools/run_tests/build_python.sh && \
+# pip install -r src/python/requirements.txt -t $grpc_dist/lib/python2.7/site-packages && \
+# CFLAGS=-I$grpc_dist/include LDFLAGS=-L$grpc_dist/lib pip install src/python/src -t $grpc_dist/lib/python2.7/site-packages
+#
+# but in the Docker image, this would have to run as root,
+# and we don't want to run bootstrap.sh as root.
+
 ln -nfs $VTTOP/third_party/go/launchpad.net $VTROOT/src
 go install launchpad.net/gozk/zookeeper
 

travis/dependencies.sh

@@ -28,7 +28,7 @@ sudo apt-get purge mysql* mariadb*
 sudo apt-get -f install libmariadbclient18 libmariadbclient-dev mariadb-client mariadb-server
 
 # Other dependencies
-sudo apt-get install time automake libtool memcached python-dev python-mysqldb libssl-dev g++ mercurial git pkg-config bison bc
+sudo apt-get install time automake libtool memcached python-dev python-mysqldb python-pip python-virtualenv libssl-dev g++ mercurial git pkg-config bison bc
 
 # Java dependencies
 wget https://dl.bintray.com/sbt/debian/sbt-0.13.6.deb