Merge pull request #1880 from tseaver/logging-gax_dependencies

tseaver · web-flow · commit 22bf022e393e · 2016-06-20T20:19:10.000-04:00
Pull in 'gax-google-logging-v2' dependency.
diff --git a/setup.py b/setup.py
@@ -23,6 +23,7 @@
     'grpcio >= 0.14.0',
     'google-gax >= 0.12.0',
     'gax-google-pubsub-v1',
+    'gax-google-logging-v2',
 ]
 
 if sys.version_info[:2] == (2, 7) and 'READTHEDOCS' not in os.environ:
diff --git a/tox.ini b/tox.ini
@@ -26,6 +26,7 @@ deps =
     grpcio >= 0.14.0
     google-gax >= 0.12.0
     gax-google-pubsub-v1
+    gax-google-logging-v2
 
 [testenv:py27]
 basepython =

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`'grpcio >= 0.14.0',`
`24`	`24`	`'google-gax >= 0.12.0',`
`25`	`25`	`'gax-google-pubsub-v1',`
	`26`	`+ 'gax-google-logging-v2',`
`26`	`27`	`]`
`27`	`28`
`28`	`29`	`if sys.version_info[:2] == (2, 7) and 'READTHEDOCS' not in os.environ:`