From 3b0fefb246caf9cf983d8ab7b69ce97b8ea7ba48 Mon Sep 17 00:00:00 2001
From: Nathaniel Manista <nathaniel@google.com>
Date: Tue, 8 Sep 2015 19:09:51 +0000
Subject: [PATCH] Beta maintenance of Python dependencies

(1) Move dependency on protobuf from grpcio to grpcio_test. While the
most-commonly-foreseen use case of grpcio makes use of protobuf,
technically protobuf is not strictly needed and there's no actual
in-code relationship between grpcio and protobuf.

(2) Loosen the dependency on protobuf from ==3.0.0a3 to >=3.0.0a3.

(3) Update all references to 0.10.0* to 0.11.0.

(4) Alphabetize the grpcio_test dependencies.
---
 src/python/grpcio/requirements.txt         | 1 -
 src/python/grpcio_health_checking/setup.py | 4 ++--
 src/python/grpcio_test/requirements.txt    | 5 +++--
 src/python/grpcio_test/setup.py            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/python/grpcio/requirements.txt b/src/python/grpcio/requirements.txt
index 43395df03b9..608ba402e09 100644
--- a/src/python/grpcio/requirements.txt
+++ b/src/python/grpcio/requirements.txt
@@ -1,3 +1,2 @@
 enum34==1.0.4
 futures==2.2.0
-protobuf==3.0.0a3
diff --git a/src/python/grpcio_health_checking/setup.py b/src/python/grpcio_health_checking/setup.py
index fcde0dab8c9..38629aa8159 100644
--- a/src/python/grpcio_health_checking/setup.py
+++ b/src/python/grpcio_health_checking/setup.py
@@ -51,7 +51,7 @@ _PACKAGE_DIRECTORIES = {
 }
 
 _INSTALL_REQUIRES = (
-    'grpcio>=0.10.0a0',
+    'grpcio>=0.11.0',
 )
 
 _SETUP_REQUIRES = _INSTALL_REQUIRES
@@ -63,7 +63,7 @@ _COMMAND_CLASS = {
 
 setuptools.setup(
     name='grpcio_health_checking',
-    version='0.10.0a0',
+    version='0.11.0',
     packages=list(_PACKAGES),
     package_dir=_PACKAGE_DIRECTORIES,
     install_requires=_INSTALL_REQUIRES,
diff --git a/src/python/grpcio_test/requirements.txt b/src/python/grpcio_test/requirements.txt
index 856198def57..cf8b8a89994 100644
--- a/src/python/grpcio_test/requirements.txt
+++ b/src/python/grpcio_test/requirements.txt
@@ -1,5 +1,6 @@
+grpcio>=0.11.0
+oauth2client>=1.4.7
+protobuf>=3.0.0a3
 pytest>=2.6
 pytest-cov>=2.0
 pytest-xdist>=1.11
-oauth2client>=1.4.7
-grpcio>=0.10.0a0
diff --git a/src/python/grpcio_test/setup.py b/src/python/grpcio_test/setup.py
index 802dd1e53af..161578a5153 100644
--- a/src/python/grpcio_test/setup.py
+++ b/src/python/grpcio_test/setup.py
@@ -71,7 +71,7 @@ _SETUP_REQUIRES = (
 
 _INSTALL_REQUIRES = (
     'oauth2client>=1.4.7',
-    'grpcio>=0.10.0a0',
+    'grpcio>=0.11.0',
 )
 
 _COMMAND_CLASS = {
@@ -80,7 +80,7 @@ _COMMAND_CLASS = {
 
 setuptools.setup(
     name='grpcio_test',
-    version='0.10.0a0',
+    version='0.11.0',
     packages=_PACKAGES,
     package_dir=_PACKAGE_DIRECTORIES,
     package_data=_PACKAGE_DATA,