From 286347e22816057d7e50f61dc1f1f274fa90dde8 Mon Sep 17 00:00:00 2001
From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>
Date: Mon, 8 Nov 2021 13:52:13 -0700
Subject: [PATCH 1/2] fix(deps): allow protobuf >=3.18.0 for python 3 users
 (#305)

https://github.com/protocolbuffers/protobuf/releases/tag/v3.18.0 dropped Python 2 support. Python 3 users can continue to use the latest version of protobuf.
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f2cf6ee90..4b1b8414e 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,8 @@
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
     "googleapis-common-protos >= 1.6.0, < 2.0dev",
-    "protobuf >= 3.12.0, < 3.18.0",
+    'protobuf >= 3.12.0, < 3.18.0; python_version < "3"',
+    'protobuf >= 3.12.0; python_version > "3"',
     "google-auth >= 1.25.0, < 2.0dev",
     "requests >= 2.18.0, < 3.0.0dev",
     "setuptools >= 40.3.0",

From d34382ffa490cab4ef5efc52d6bd991c7280a0a7 Mon Sep 17 00:00:00 2001
From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>
Date: Mon, 8 Nov 2021 14:32:02 -0700
Subject: [PATCH 2/2] chore: release 1.31.4 (#306)

---
 CHANGELOG.md               | 7 +++++++
 google/api_core/version.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac6405e55..b3c40d2e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 [1]: https://pypi.org/project/google-api-core/#history
 
+### [1.31.4](https://www.github.com/googleapis/python-api-core/compare/v1.31.3...v1.31.4) (2021-11-08)
+
+
+### Bug Fixes
+
+* fix(deps): allow protobuf >=3.18.0 for python 3 users ([#305](https://www.github.com/googleapis/python-api-core/issues/305)) ([286347e](https://github.com/googleapis/python-api-core/commit/286347e22816057d7e50f61dc1f1f274fa90dde8))
+
 ### [1.31.3](https://www.github.com/googleapis/python-api-core/compare/v1.31.2...v1.31.3) (2021-09-20)
 
 
diff --git a/google/api_core/version.py b/google/api_core/version.py
index 8a73b2fc7..452b047d4 100644
--- a/google/api_core/version.py
+++ b/google/api_core/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.31.3"
+__version__ = "1.31.4"