Merge pull request #1553 from dhermes/enable-grpcio

Adding grpcio to setup.py as an extra.
googleapis · Mar 3, 2016 · 1193eab · 1193eab
2 parents cba090e + bcd9d3d
commit 1193eab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -1,6 +1,5 @@
 import os
 
-
 from setuptools import setup
 from setuptools import find_packages
 
@@ -19,6 +18,7 @@
     'pyOpenSSL',
     'six',
 ]
+GRPC_EXTRAS = ['grpcio >= 0.13.0']
 
 setup(
     name='gcloud',
@@ -35,6 +35,7 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=REQUIREMENTS,
+    extras_require={'grpc': GRPC_EXTRAS},
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',

diff --git a/tox.ini b/tox.ini
@@ -21,6 +21,15 @@ covercmd =
       --cover-branches \
       --nocapture
 
+[testenv:py27]
+basepython =
+    python2.7
+deps =
+    {[testenv]deps}
+    grpcio >= 0.13.0
+setenv =
+    PYTHONPATH =
+
 [testenv:cover]
 basepython =
     python2.7