Use moved iam.policy now at google.api_core.iam.policy (#6741)

crwilcox · web-flow · commit 2842fa877e29 · 2018-12-03T13:59:48.000-08:00
* update references to iam to use api-core\
* Update dependency to api_core
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +1326,15 @@ 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
                       ``NoneType``
         :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
@@ -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,15 +1589,15 @@ 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
                       ``NoneType``
         :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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/translate/setup.py b/translate/setup.py
diff --git a/videointelligence/setup.py b/videointelligence/setup.py
diff --git a/vision/setup.py b/vision/setup.py
diff --git a/websecurityscanner/setup.py b/websecurityscanner/setup.py

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`# 'Development Status :: 5 - Production/Stable'`
`29`	`29`	`release_status = 'Development Status :: 3 - Alpha'`
`30`	`30`	`dependencies = [`
`31`		`- 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',`
	`31`	`+ 'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',`
`32`	`32`	`'enum34; python_version < "3.4"',`
`33`	`33`	`'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',`
`34`	`34`	`]`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`version = '0.1.1'`
`23`	`23`	`release_status = 'Development Status :: 3 - Alpha'`
`24`	`24`	`dependencies = [`
`25`		`- 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',`
	`25`	`+ 'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',`
`26`	`26`	`'enum34; python_version < "3.4"',`
`27`	`27`	`]`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`# 'Development Status :: 5 - Production/Stable'`
`30`	`30`	`release_status = 'Development Status :: 5 - Production/Stable'`
`31`	`31`	`dependencies = [`
`32`		`- 'google-api-core >= 1.0.0, < 2.0.0dev',`
	`32`	`+ 'google-api-core >= 1.6.0, < 2.0.0dev',`
`33`	`33`	`'google-cloud-core >= 0.28.0, < 0.29dev',`
`34`	`34`	`'google-resumable-media >= 0.3.1',`
`35`	`35`	`]`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`version = '0.1.0'`
`25`	`25`	`release_status = 'Development Status :: 3 - Alpha'`
`26`	`26`	`dependencies = [`
`27`		`- 'google-api-core[grpc] >= 1.5.1, < 2.0.0dev',`
	`27`	`+ 'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',`
`28`	`28`	`'enum34; python_version < "3.4"',`
`29`	`29`	`]`
`30`	`30`	`extras = {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`# 'Development Status :: 5 - Production/Stable'`
`43`	`43`	`release_status = 'Development Status :: 3 - Alpha'`
`44`	`44`	`dependencies = [`
`45`		`- 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev',`
	`45`	`+ 'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',`
`46`	`46`	`]`
`47`	`47`	`extras = {`
`48`	`48`	`}`