From 2842fa877e29a41b5039a7dc25adf28ebe90ebae Mon Sep 17 00:00:00 2001
From: Christopher Wilcox <crwilcox@google.com>
Date: Mon, 3 Dec 2018 13:59:48 -0800
Subject: [PATCH] Use moved iam.policy now at google.api_core.iam.policy
 (#6741)

* update references to iam to use api-core\
* Update dependency to api_core
---
 asset/setup.py                             | 2 +-
 automl/setup.py                            | 2 +-
 bigquery/setup.py                          | 2 +-
 bigquery_storage/setup.py                  | 2 +-
 bigtable/google/cloud/bigtable/instance.py | 2 +-
 bigtable/google/cloud/bigtable/policy.py   | 2 +-
 bigtable/setup.py                          | 2 +-
 container/setup.py                         | 2 +-
 dataproc/setup.py                          | 2 +-
 datastore/setup.py                         | 2 +-
 dlp/setup.py                               | 2 +-
 firestore/setup.py                         | 2 +-
 iot/setup.py                               | 2 +-
 kms/setup.py                               | 2 +-
 language/setup.py                          | 2 +-
 logging/setup.py                           | 2 +-
 monitoring/setup.py                        | 2 +-
 oslogin/setup.py                           | 2 +-
 pubsub/setup.py                            | 2 +-
 redis/setup.py                             | 2 +-
 resource_manager/setup.py                  | 2 +-
 runtimeconfig/setup.py                     | 2 +-
 scheduler/setup.py                         | 2 +-
 securitycenter/setup.py                    | 2 +-
 speech/setup.py                            | 2 +-
 storage/google/cloud/storage/blob.py       | 8 ++++----
 storage/google/cloud/storage/bucket.py     | 8 ++++----
 storage/setup.py                           | 2 +-
 storage/tests/unit/test_blob.py            | 8 ++++----
 storage/tests/unit/test_bucket.py          | 8 ++++----
 tasks/setup.py                             | 2 +-
 texttospeech/setup.py                      | 2 +-
 trace/setup.py                             | 2 +-
 translate/setup.py                         | 2 +-
 videointelligence/setup.py                 | 2 +-
 vision/setup.py                            | 2 +-
 websecurityscanner/setup.py                | 2 +-
 37 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/asset/setup.py b/asset/setup.py
index 26b101040869..f256aed9a8c9 100644
--- a/asset/setup.py
+++ b/asset/setup.py
@@ -28,7 +28,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34; python_version < "3.4"',
     'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
 ]
diff --git a/automl/setup.py b/automl/setup.py
index d819e8bb7ce2..23136b773250 100644
--- a/automl/setup.py
+++ b/automl/setup.py
@@ -22,7 +22,7 @@
 version = '0.1.1'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/bigquery/setup.py b/bigquery/setup.py
index 5c4aa468d74d..7022e0d03558 100644
--- a/bigquery/setup.py
+++ b/bigquery/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 5 - Production/Stable'
 dependencies = [
-    'google-api-core >= 1.0.0, < 2.0.0dev',
+    'google-api-core >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, < 0.29dev',
     'google-resumable-media >= 0.3.1',
 ]
diff --git a/bigquery_storage/setup.py b/bigquery_storage/setup.py
index 1f456a25e649..b968c56114c3 100644
--- a/bigquery_storage/setup.py
+++ b/bigquery_storage/setup.py
@@ -24,7 +24,7 @@
 version = '0.1.0'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.5.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34; python_version < "3.4"',
 ]
 extras = {
diff --git a/bigtable/google/cloud/bigtable/instance.py b/bigtable/google/cloud/bigtable/instance.py
index d494d7c1b936..47c8d5f539da 100644
--- a/bigtable/google/cloud/bigtable/instance.py
+++ b/bigtable/google/cloud/bigtable/instance.py
@@ -473,7 +473,7 @@ def test_iam_permissions(self, permissions):
     def _to_dict_from_policy_pb(self, policy):
         """Returns a dictionary representation of resource returned from
         the getIamPolicy API to use as parameter for
-        :meth: google.cloud.iam.Policy.from_api_repr
+        :meth: google.api_core.iam.Policy.from_api_repr
         """
         pb_dict = {}
         bindings = [
diff --git a/bigtable/google/cloud/bigtable/policy.py b/bigtable/google/cloud/bigtable/policy.py
index 87c9a7650c2e..039cea9f3e9e 100644
--- a/bigtable/google/cloud/bigtable/policy.py
+++ b/bigtable/google/cloud/bigtable/policy.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.cloud.iam import Policy as BasePolicy
+from google.api_core.iam import Policy as BasePolicy
 from google.cloud._helpers import _to_bytes
 
 """IAM roles supported by Bigtable Instance resource"""
diff --git a/bigtable/setup.py b/bigtable/setup.py
index a44311f7d3b9..01194d784f49 100644
--- a/bigtable/setup.py
+++ b/bigtable/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 4 - Beta'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, <0.29dev',
     'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
 ]
diff --git a/container/setup.py b/container/setup.py
index c50f95431f9c..01f1a17174be 100644
--- a/container/setup.py
+++ b/container/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 extras = {
 }
diff --git a/dataproc/setup.py b/dataproc/setup.py
index df1914b28b76..811dfd060f61 100644
--- a/dataproc/setup.py
+++ b/dataproc/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 extras = {
 }
diff --git a/datastore/setup.py b/datastore/setup.py
index 7cf1a2491e6d..870117bd8a02 100644
--- a/datastore/setup.py
+++ b/datastore/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 5 - Production/Stable'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >=0.28.0, <0.29dev',
 ]
 extras = {
diff --git a/dlp/setup.py b/dlp/setup.py
index 24621803a015..9988754946fe 100644
--- a/dlp/setup.py
+++ b/dlp/setup.py
@@ -24,7 +24,7 @@
 version = '0.9.0'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/firestore/setup.py b/firestore/setup.py
index e36295e4394a..abadeb7ab34b 100644
--- a/firestore/setup.py
+++ b/firestore/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 4 - Beta'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, < 0.29dev',
     'pytz',
 ]
diff --git a/iot/setup.py b/iot/setup.py
index e856f5542aff..3c4e409cd2c6 100644
--- a/iot/setup.py
+++ b/iot/setup.py
@@ -22,7 +22,7 @@
 version = '0.1.0'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
     'enum34; python_version < "3.4"',
 ]
diff --git a/kms/setup.py b/kms/setup.py
index 6159fb7cce99..686c1635128f 100644
--- a/kms/setup.py
+++ b/kms/setup.py
@@ -24,7 +24,7 @@
 version = '0.2.0'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
     'enum34; python_version < "3.4"',
 ]
diff --git a/language/setup.py b/language/setup.py
index 75fe19a0e269..0abb0d31e2b0 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 5 - Production/Stable'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34;python_version<"3.4"'
 ]
 extras = {
diff --git a/logging/setup.py b/logging/setup.py
index 85eeaf96889e..99315b7383cd 100644
--- a/logging/setup.py
+++ b/logging/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 5 - Production/Stable'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, < 0.29dev',
 ]
 extras = {
diff --git a/monitoring/setup.py b/monitoring/setup.py
index 0dcf12f7ecf7..b0a19250dab3 100644
--- a/monitoring/setup.py
+++ b/monitoring/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 extras = {
     'pandas': 'pandas >= 0.17.1',
diff --git a/oslogin/setup.py b/oslogin/setup.py
index 49577b10c793..492007958dda 100644
--- a/oslogin/setup.py
+++ b/oslogin/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 extras = {
 }
diff --git a/pubsub/setup.py b/pubsub/setup.py
index 70c7c5c3264a..14d78aa1a1ed 100644
--- a/pubsub/setup.py
+++ b/pubsub/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 4 - Beta'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
     'enum34; python_version < "3.4"',
 ]
diff --git a/redis/setup.py b/redis/setup.py
index f24540b56cf5..cc1c0bfc7895 100644
--- a/redis/setup.py
+++ b/redis/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34; python_version < "3.4"',
 ]
 extras = {
diff --git a/resource_manager/setup.py b/resource_manager/setup.py
index b24ad370d079..68013cc2027a 100644
--- a/resource_manager/setup.py
+++ b/resource_manager/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core >= 1.0.0, < 2.0.0dev',
+    'google-api-core >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, < 0.29dev',
 ]
 extras = {
diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py
index 2620776cf1ee..dc7e53817569 100644
--- a/runtimeconfig/setup.py
+++ b/runtimeconfig/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core >= 1.0.0, < 2.0.0dev',
+    'google-api-core >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, < 0.29dev',
 ]
 extras = {
diff --git a/scheduler/setup.py b/scheduler/setup.py
index 5bf9d2970a0d..047a5af67f2a 100644
--- a/scheduler/setup.py
+++ b/scheduler/setup.py
@@ -28,7 +28,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/securitycenter/setup.py b/securitycenter/setup.py
index 46bd18de233b..7b60e6e657b6 100644
--- a/securitycenter/setup.py
+++ b/securitycenter/setup.py
@@ -24,7 +24,7 @@
 version = '0.1.0'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
     'enum34; python_version < "3.4"',
 ]
diff --git a/speech/setup.py b/speech/setup.py
index 52cb3ccd0c1c..87e279dab473 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 4 - Beta'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 extras = {
 }
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index d8d9a3bc95b9..e137629cf4df 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -51,7 +51,7 @@
 from google.cloud._helpers import _to_bytes
 from google.cloud._helpers import _bytes_to_unicode
 from google.cloud.exceptions import NotFound
-from google.cloud.iam import Policy
+from google.api_core.iam import Policy
 from google.cloud.storage._helpers import _PropertyMixin
 from google.cloud.storage._helpers import _scalar_property
 from google.cloud.storage._signing import generate_signed_url
@@ -1293,7 +1293,7 @@ def get_iam_policy(self, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current object's bucket.
 
-        :rtype: :class:`google.cloud.iam.Policy`
+        :rtype: :class:`google.api_core.iam.Policy`
         :returns: the policy instance, based on the resource returned from
                   the ``getIamPolicy`` API request.
         """
@@ -1326,7 +1326,7 @@ def set_iam_policy(self, policy, client=None):
         If :attr:`user_project` is set on the bucket, bills the API request
         to that project.
 
-        :type policy: :class:`google.cloud.iam.Policy`
+        :type policy: :class:`google.api_core.iam.Policy`
         :param policy: policy instance used to update bucket's IAM policy.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -1334,7 +1334,7 @@ def set_iam_policy(self, policy, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
 
-        :rtype: :class:`google.cloud.iam.Policy`
+        :rtype: :class:`google.api_core.iam.Policy`
         :returns: the policy instance, based on the resource returned from
                   the ``setIamPolicy`` API request.
         """
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index c76b6ddf2a3b..8304a92a5266 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -28,7 +28,7 @@
 from google.cloud._helpers import _NOW
 from google.cloud._helpers import _rfc3339_to_datetime
 from google.cloud.exceptions import NotFound
-from google.cloud.iam import Policy
+from google.api_core.iam import Policy
 from google.cloud.storage import _signing
 from google.cloud.storage._helpers import _PropertyMixin
 from google.cloud.storage._helpers import _scalar_property
@@ -1563,7 +1563,7 @@ def get_iam_policy(self, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
 
-        :rtype: :class:`google.cloud.iam.Policy`
+        :rtype: :class:`google.api_core.iam.Policy`
         :returns: the policy instance, based on the resource returned from
                   the ``getIamPolicy`` API request.
         """
@@ -1589,7 +1589,7 @@ def set_iam_policy(self, policy, client=None):
 
         If :attr:`user_project` is set, bills the API request to that project.
 
-        :type policy: :class:`google.cloud.iam.Policy`
+        :type policy: :class:`google.api_core.iam.Policy`
         :param policy: policy instance used to update bucket's IAM policy.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -1597,7 +1597,7 @@ def set_iam_policy(self, policy, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
 
-        :rtype: :class:`google.cloud.iam.Policy`
+        :rtype: :class:`google.api_core.iam.Policy`
         :returns: the policy instance, based on the resource returned from
                   the ``setIamPolicy`` API request.
         """
diff --git a/storage/setup.py b/storage/setup.py
index 06425d046e0b..34e7274ab425 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 5 - Production/Stable'
 dependencies = [
-    'google-api-core >= 1.0.0, < 2.0.0dev',
+    'google-api-core >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, < 0.29dev',
     'google-resumable-media >= 0.3.1',
 ]
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index 5450ccd4c4e6..5a4eb554796b 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -1884,7 +1884,7 @@ def test_get_iam_policy(self):
         from google.cloud.storage.iam import STORAGE_OWNER_ROLE
         from google.cloud.storage.iam import STORAGE_EDITOR_ROLE
         from google.cloud.storage.iam import STORAGE_VIEWER_ROLE
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         BLOB_NAME = "blob-name"
         PATH = "/b/name/o/%s" % (BLOB_NAME,)
@@ -1935,7 +1935,7 @@ def test_get_iam_policy(self):
         )
 
     def test_get_iam_policy_w_user_project(self):
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         BLOB_NAME = "blob-name"
         USER_PROJECT = "user-project-123"
@@ -1979,7 +1979,7 @@ def test_set_iam_policy(self):
         from google.cloud.storage.iam import STORAGE_OWNER_ROLE
         from google.cloud.storage.iam import STORAGE_EDITOR_ROLE
         from google.cloud.storage.iam import STORAGE_VIEWER_ROLE
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         BLOB_NAME = "blob-name"
         PATH = "/b/name/o/%s" % (BLOB_NAME,)
@@ -2029,7 +2029,7 @@ def test_set_iam_policy(self):
             self.assertEqual(sorted(found["members"]), sorted(expected["members"]))
 
     def test_set_iam_policy_w_user_project(self):
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         BLOB_NAME = "blob-name"
         USER_PROJECT = "user-project-123"
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index 8cb1523536de..cee84decfc42 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -1613,7 +1613,7 @@ def test_get_iam_policy(self):
         from google.cloud.storage.iam import STORAGE_OWNER_ROLE
         from google.cloud.storage.iam import STORAGE_EDITOR_ROLE
         from google.cloud.storage.iam import STORAGE_VIEWER_ROLE
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         NAME = "name"
         PATH = "/b/%s" % (NAME,)
@@ -1656,7 +1656,7 @@ def test_get_iam_policy(self):
         self.assertEqual(kw[0]["query_params"], {})
 
     def test_get_iam_policy_w_user_project(self):
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         NAME = "name"
         USER_PROJECT = "user-project-123"
@@ -1692,7 +1692,7 @@ def test_set_iam_policy(self):
         from google.cloud.storage.iam import STORAGE_OWNER_ROLE
         from google.cloud.storage.iam import STORAGE_EDITOR_ROLE
         from google.cloud.storage.iam import STORAGE_VIEWER_ROLE
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         NAME = "name"
         PATH = "/b/%s" % (NAME,)
@@ -1744,7 +1744,7 @@ def test_set_iam_policy_w_user_project(self):
         from google.cloud.storage.iam import STORAGE_OWNER_ROLE
         from google.cloud.storage.iam import STORAGE_EDITOR_ROLE
         from google.cloud.storage.iam import STORAGE_VIEWER_ROLE
-        from google.cloud.iam import Policy
+        from google.api_core.iam import Policy
 
         NAME = "name"
         USER_PROJECT = "user-project-123"
diff --git a/tasks/setup.py b/tasks/setup.py
index de593a820538..7167db84a671 100644
--- a/tasks/setup.py
+++ b/tasks/setup.py
@@ -24,7 +24,7 @@
 version = '0.3.0'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
     'enum34; python_version < "3.4"',
 ]
diff --git a/texttospeech/setup.py b/texttospeech/setup.py
index 888a01747ba1..3559f346014b 100644
--- a/texttospeech/setup.py
+++ b/texttospeech/setup.py
@@ -42,7 +42,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 extras = {
 }
diff --git a/trace/setup.py b/trace/setup.py
index 02e6f3672928..ba983d41b635 100644
--- a/trace/setup.py
+++ b/trace/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >=0.28.0, <0.29dev',
 ]
 extras = {
diff --git a/translate/setup.py b/translate/setup.py
index c13cc273f135..be9dcc266e35 100644
--- a/translate/setup.py
+++ b/translate/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 5 - Production/Stable'
 dependencies = [
-    'google-api-core >= 1.0.0, < 2.0.0dev',
+    'google-api-core >= 1.6.0, < 2.0.0dev',
     'google-cloud-core >= 0.28.0, < 0.29dev',
 ]
 extras = {
diff --git a/videointelligence/setup.py b/videointelligence/setup.py
index 69554394bb7b..2cfe9cb006c9 100644
--- a/videointelligence/setup.py
+++ b/videointelligence/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 5 - Production/Stable'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 extras = {
 }
diff --git a/vision/setup.py b/vision/setup.py
index a833d57a272d..dbc428e1127f 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -22,7 +22,7 @@
 version = '0.35.1'
 release_status = 'Development Status :: 4 - Beta'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/websecurityscanner/setup.py b/websecurityscanner/setup.py
index 2d8f76b0a704..b54c20cd62e3 100644
--- a/websecurityscanner/setup.py
+++ b/websecurityscanner/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
-    'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',
+    'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
 ]
 
 extras = {