commit 42028ed2b2be47f85b70eb813185264f1f573d01
author arithmetic1728 <58957152+arithmetic1728@users.noreply.github.com> Tue Jun 02 11:24:04 2020 -0700
committer GitHub <noreply@github.com> Tue Jun 02 18:24:04 2020 +0000
tree f262311d91419b7fb45e71a47ec85b39c3ba5272
parent cafb9e0403e7e0f6a1aefbde226e4a3b37924121

fix: fix python-api-core dependency issue (#931)

`ClientOptions` doesn't have `client_encryted_cert_source` property yet. Check the existence of the property before accessing it.

googleapiclient/discovery.py

diff --git a/googleapiclient/discovery.py b/googleapiclient/discovery.py
index 115609f..55367c0 100644
--- a/googleapiclient/discovery.py
+++ b/googleapiclient/discovery.py
@@ -441,7 +441,11 @@
             raise MutualTLSChannelError(
                 "ClientOptions.client_cert_source is not supported, please use ClientOptions.client_encrypted_cert_source."
             )
-        if client_options and client_options.client_encrypted_cert_source:
+        if (
+            client_options
+            and hasattr(client_options, "client_encrypted_cert_source")
+            and client_options.client_encrypted_cert_source
+        ):
             client_cert_to_use = client_options.client_encrypted_cert_source
         elif adc_cert_path and adc_key_path and mtls.has_default_client_cert_source():
             client_cert_to_use = mtls.default_client_encrypted_cert_source(

setup.py

diff --git a/setup.py b/setup.py
index 8d6edae..f15ae37 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
     "httplib2>=0.9.2,<1dev",
     "google-auth>=1.16.0",
     "google-auth-httplib2>=0.0.3",
-    "google-api-core>=1.13.0,<2dev",
+    "google-api-core>=1.17.0,<2dev",
     "six>=1.6.1,<2dev",
     "uritemplate>=3.0.0,<4dev",
 ]