From 0c15790720ff573a501cfe760dd74ee166e1a353 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Thu, 3 Mar 2022 18:06:21 -0500
Subject: [PATCH] fix(deps): require google-api-core>=1.31.5, >=2.3.2 (#1157)

fix(deps): require proto-plus>=1.15.0
---
 setup.py                    | 4 ++--
 testing/constraints-3.6.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 6a28d21c3..63cdf747c 100644
--- a/setup.py
+++ b/setup.py
@@ -34,8 +34,8 @@
     # NOTE: Maintainers, please do not require google-api-core>=2.x.x
     # Until this issue is closed
     # https://github.com/googleapis/google-cloud-python/issues/10566
-    "google-api-core[grpc] >= 1.29.0, <3.0.0dev",
-    "proto-plus >= 1.10.0",
+    "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
+    "proto-plus >= 1.15.0",
     # NOTE: Maintainers, please do not require google-cloud-core>=2.x.x
     # Until this issue is closed
     # https://github.com/googleapis/google-cloud-python/issues/10566
diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt
index 7f52e441d..0258515eb 100644
--- a/testing/constraints-3.6.txt
+++ b/testing/constraints-3.6.txt
@@ -6,7 +6,7 @@
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
 geopandas==0.9.0
-google-api-core==1.29.0
+google-api-core==1.31.5
 google-cloud-bigquery-storage==2.0.0
 google-cloud-core==1.4.1
 google-resumable-media==0.6.0
@@ -16,7 +16,7 @@ opentelemetry-api==1.1.0
 opentelemetry-instrumentation==0.20b0
 opentelemetry-sdk==1.1.0
 pandas==0.24.2
-proto-plus==1.10.0
+proto-plus==1.15.0
 protobuf==3.12.0
 pyarrow==3.0.0
 python-dateutil==2.7.2