Merge pull request #1654 from jtattermusch/protobuf-upgrade

Upgrading protobuf to v3.0.0-alpha-1-150-g7d5cf8d.

src/python/requirements.txt

@@ -1,3 +1,3 @@
 enum34==1.0.4
 futures==2.2.0
-protobuf==3.0.0-alpha-1
+protobuf==3.0.0a2

src/python/src/setup.py

@@ -93,6 +93,6 @@ setuptools.setup(
     install_requires=[
         'enum34==1.0.4',
         'futures==2.2.0',
-        'protobuf==3.0.0-alpha-1'
+        'protobuf==3.0.0a2'
     ]
 )

third_party/protobuf

@@ -1 +1 @@
-Subproject commit 644a6a1da71385e9d7a7a26b3476c93fdd71788c
+Subproject commit 7d5cf8d7a1bd24acce56296747731051ebe1b180

tools/dockerfile/grpc_python_base/Dockerfile

@@ -43,7 +43,7 @@ RUN apt-get update && apt-get install -y \
     python-virtualenv
 
 # Install Python packages from PyPI
-RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0-alpha-1
+RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2
 
 # Get the GRPC source from GitHub
 RUN git clone --recursive https://github.com/grpc/grpc.git /var/local/git/grpc

tools/run_tests/build_python.sh

@@ -37,6 +37,6 @@ root=`pwd`
 rm -rf python2.7_virtual_environment
 virtualenv -p /usr/bin/python2.7 python2.7_virtual_environment
 source python2.7_virtual_environment/bin/activate
-pip install enum34==1.0.4 futures==2.2.0 protobuf==3.0.0-alpha-1
+pip install enum34==1.0.4 futures==2.2.0 protobuf==3.0.0a2
 CFLAGS=-I$root/include LDFLAGS=-L$root/libs/$CONFIG pip install src/python/src
 pip install src/python/interop

tools/run_tests/run_sanity.sh

@@ -45,6 +45,6 @@ git submodule > $submodules
 diff -u $submodules - << EOF
  05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
  3df69d3aefde7671053d4e3c242b228e5d79c83f third_party/openssl (OpenSSL_1_0_2a)
- 644a6a1da71385e9d7a7a26b3476c93fdd71788c third_party/protobuf (v3.0.0-alpha-1-35-g644a6a1)
+ 7d5cf8d7a1bd24acce56296747731051ebe1b180 third_party/protobuf (v3.0.0-alpha-1-150-g7d5cf8d)
  50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
 EOF