Use install_requires for platform dependencies instead of extras_require (googleapis#4991)

david-gang · Jon Wayne Parrott · commit cd8a69bd03ea · 2018-03-22T13:41:39.000-07:00
diff --git a/api_core/setup.py b/api_core/setup.py
@@ -36,10 +36,10 @@
     'setuptools>=34.0.0',
     'six>=1.10.0',
     'pytz',
+    'futures>=3.2.0;python_version<"3.2"'
 ]
 extras = {
-    'grpc': 'grpcio>=1.8.2',
-    ':python_version < "3.2"': 'futures>=3.2.0',
+    'grpc': 'grpcio>=1.8.2'
 }
 
 
diff --git a/vision/setup.py b/vision/setup.py
@@ -30,9 +30,9 @@
 release_status = 'Development Status :: 4 - Beta'
 dependencies = [
     'google-api-core[grpc]<2.0.0dev,>=0.1.0',
+    'enum34;python_version<"3.4"'
 ]
 extras = {
-    ':python_version < "3.4"': 'enum34',
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@`
`30`	`30`	`release_status = 'Development Status :: 4 - Beta'`
`31`	`31`	`dependencies = [`
`32`	`32`	`'google-api-core[grpc]<2.0.0dev,>=0.1.0',`
	`33`	`+ 'enum34;python_version<"3.4"'`
`33`	`34`	`]`
`34`	`35`	`extras = {`
`35`		`- ':python_version < "3.4"': 'enum34',`
`36`	`36`	`}`
`37`	`37`
`38`	`38`