From c09afdd54e576d2d5ff91bf915cf841f1c1dc720 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 30 May 2022 17:46:22 +0000
Subject: [PATCH 1/5] chore: use gapic-generator-python 1.0.0 (#166)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 451250442

Source-Link: https://github.com/googleapis/googleapis/commit/cca5e8181f6442b134e8d4d206fbe9e0e74684ba

Source-Link: https://github.com/googleapis/googleapis-gen/commit/0b219da161a8bdcc3c6f7b2efcd82105182a30ca
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMGIyMTlkYTE2MWE4YmRjYzNjNmY3YjJlZmNkODIxMDUxODJhMzBjYSJ9
---
 tests/unit/gapic/appengine_admin_v1/test_applications.py  | 8 +++++++-
 .../appengine_admin_v1/test_authorized_certificates.py    | 8 +++++++-
 .../gapic/appengine_admin_v1/test_authorized_domains.py   | 8 +++++++-
 .../unit/gapic/appengine_admin_v1/test_domain_mappings.py | 8 +++++++-
 tests/unit/gapic/appengine_admin_v1/test_firewall.py      | 8 +++++++-
 tests/unit/gapic/appengine_admin_v1/test_instances.py     | 8 +++++++-
 tests/unit/gapic/appengine_admin_v1/test_services.py      | 8 +++++++-
 tests/unit/gapic/appengine_admin_v1/test_versions.py      | 8 +++++++-
 8 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/tests/unit/gapic/appengine_admin_v1/test_applications.py b/tests/unit/gapic/appengine_admin_v1/test_applications.py
index 205bbeb..dcd6dfb 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_applications.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_applications.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py b/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py
index 9e95c2e..b19deae 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py b/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py
index 19b8ae1..6a618f6 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py b/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py
index 4ddf609..76999df 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/appengine_admin_v1/test_firewall.py b/tests/unit/gapic/appengine_admin_v1/test_firewall.py
index 9291205..dea4bbd 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_firewall.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_firewall.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/appengine_admin_v1/test_instances.py b/tests/unit/gapic/appengine_admin_v1/test_instances.py
index 14a3ade..22591dd 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_instances.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_instances.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/appengine_admin_v1/test_services.py b/tests/unit/gapic/appengine_admin_v1/test_services.py
index 9b60574..c2a22ff 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_services.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_services.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/appengine_admin_v1/test_versions.py b/tests/unit/gapic/appengine_admin_v1/test_versions.py
index 9bf3cd1..d66081a 100644
--- a/tests/unit/gapic/appengine_admin_v1/test_versions.py
+++ b/tests/unit/gapic/appengine_admin_v1/test_versions.py
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 import os
-import mock
+
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 import grpc
 from grpc.experimental import aio

From d18523f1e900cd3d59ab5919629680f1023cb5da Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 1 Jun 2022 22:30:19 -0400
Subject: [PATCH 2/5] fix(deps): require protobuf <4.0.0dev (#167)

* fix(deps): require protobuf <4.0.0dev

* update constraints
---
 setup.py                    | 6 +++---
 testing/constraints-3.6.txt | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index dc285df..8e2918a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,9 +29,9 @@
     # Until this issue is closed
     # https://github.com/googleapis/google-cloud-python/issues/10566
     "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
-    "proto-plus >= 1.18.1",
-    "grpc-google-iam-v1",
-    "six",
+    "proto-plus >= 1.18.1, <2.0.0dev",
+    "protobuf >= 3.19.0, <4.0.0dev",
+    "grpc-google-iam-v1 >=0.12.4, <1.0.0dev",
 ]
 
 package_root = os.path.abspath(os.path.dirname(__file__))
diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt
index 64d95bb..85fd9f0 100644
--- a/testing/constraints-3.6.txt
+++ b/testing/constraints-3.6.txt
@@ -7,5 +7,5 @@
 # Then this file should have foo==1.14.0
 google-api-core==1.31.5
 proto-plus==1.18.1
-grpc-google-iam-v1==0.12.3
-six==1.13.0
+grpc-google-iam-v1==0.12.4
+protobuf==3.19.0

From 32eb9839a119be5c9189140e02dd8e2c2798cbf3 Mon Sep 17 00:00:00 2001
From: Dan Lee <71398022+dandhlee@users.noreply.github.com>
Date: Thu, 2 Jun 2022 20:40:33 -0400
Subject: [PATCH 3/5] docs: fix changelog header to consistent size (#168)

Co-authored-by: Anthonios Partheniou <partheniou@google.com>
---
 CHANGELOG.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cd98b6..97ab078 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,21 +11,21 @@
 * add Version.app_engine_apis ([595a87c](https://github.com/googleapis/python-appengine-admin/commit/595a87cd561cf26da72599adc6750fdf20a2f1b5))
 * add VpcAccessConnector.egress_setting ([595a87c](https://github.com/googleapis/python-appengine-admin/commit/595a87cd561cf26da72599adc6750fdf20a2f1b5))
 
-### [1.3.3](https://github.com/googleapis/python-appengine-admin/compare/v1.3.2...v1.3.3) (2022-04-14)
+## [1.3.3](https://github.com/googleapis/python-appengine-admin/compare/v1.3.2...v1.3.3) (2022-04-14)
 
 
 ### Documentation
 
 * fix type in docstring for map fields ([b0ce988](https://github.com/googleapis/python-appengine-admin/commit/b0ce988cf7ec3620d6d586abab8b13de50e8b586))
 
-### [1.3.2](https://github.com/googleapis/python-appengine-admin/compare/v1.3.1...v1.3.2) (2022-03-05)
+## [1.3.2](https://github.com/googleapis/python-appengine-admin/compare/v1.3.1...v1.3.2) (2022-03-05)
 
 
 ### Bug Fixes
 
 * **deps:** require google-api-core>=1.31.5, >=2.3.2 ([#115](https://github.com/googleapis/python-appengine-admin/issues/115)) ([a4b3624](https://github.com/googleapis/python-appengine-admin/commit/a4b36244e2e566770f3cca84aac9bb003ca47f56))
 
-### [1.3.1](https://github.com/googleapis/python-appengine-admin/compare/v1.3.0...v1.3.1) (2022-02-11)
+## [1.3.1](https://github.com/googleapis/python-appengine-admin/compare/v1.3.0...v1.3.1) (2022-02-11)
 
 
 ### Bug Fixes
@@ -44,7 +44,7 @@
 
 * add api key support ([#100](https://github.com/googleapis/python-appengine-admin/issues/100)) ([67f3bb4](https://github.com/googleapis/python-appengine-admin/commit/67f3bb4c0fa31f795c6aef4bd19b9a5fe9da0360))
 
-### [1.2.1](https://www.github.com/googleapis/python-appengine-admin/compare/v1.2.0...v1.2.1) (2021-11-01)
+## [1.2.1](https://www.github.com/googleapis/python-appengine-admin/compare/v1.2.0...v1.2.1) (2021-11-01)
 
 
 ### Bug Fixes
@@ -65,21 +65,21 @@
 * add context manager support in client ([#75](https://www.github.com/googleapis/python-appengine-admin/issues/75)) ([e5d86ee](https://www.github.com/googleapis/python-appengine-admin/commit/e5d86eef07ee05454135b5b392a6841f7932a303))
 * add trove classifier for python 3.10 ([#78](https://www.github.com/googleapis/python-appengine-admin/issues/78)) ([e915580](https://www.github.com/googleapis/python-appengine-admin/commit/e915580dd5e66a4d44cede94acfde0e181e9fe3a))
 
-### [1.1.5](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.4...v1.1.5) (2021-09-30)
+## [1.1.5](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.4...v1.1.5) (2021-09-30)
 
 
 ### Bug Fixes
 
 * improper types in pagers generation ([a29e420](https://www.github.com/googleapis/python-appengine-admin/commit/a29e4200c6fdb7cad045bfd29e74a35c9a6e6fd6))
 
-### [1.1.4](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.3...v1.1.4) (2021-09-24)
+## [1.1.4](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.3...v1.1.4) (2021-09-24)
 
 
 ### Bug Fixes
 
 * add 'dict' annotation type to 'request' ([89b4378](https://www.github.com/googleapis/python-appengine-admin/commit/89b4378632af08a11c3bd45d88eb0f0ac152238f))
 
-### [1.1.3](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.2...v1.1.3) (2021-07-27)
+## [1.1.3](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.2...v1.1.3) (2021-07-27)
 
 
 ### Bug Fixes
@@ -96,14 +96,14 @@
 
 * release as 1.1.3 ([#54](https://www.github.com/googleapis/python-appengine-admin/issues/54)) ([aeeefd1](https://www.github.com/googleapis/python-appengine-admin/commit/aeeefd10f953ec09ddc8e3bde38f0d90bdab47f8))
 
-### [1.1.2](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.1...v1.1.2) (2021-07-21)
+## [1.1.2](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.1...v1.1.2) (2021-07-21)
 
 
 ### Bug Fixes
 
 * **deps:** pin 'google-{api,cloud}-core', 'google-auth' to allow 2.x versions ([#48](https://www.github.com/googleapis/python-appengine-admin/issues/48)) ([c9fac07](https://www.github.com/googleapis/python-appengine-admin/commit/c9fac071151957e69fd83cb9aefb027c6551a55c))
 
-### [1.1.1](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.0...v1.1.1) (2021-06-30)
+## [1.1.1](https://www.github.com/googleapis/python-appengine-admin/compare/v1.1.0...v1.1.1) (2021-06-30)
 
 
 ### Bug Fixes
@@ -123,14 +123,14 @@
 
 * omit mention of Python 2.7 in 'CONTRIBUTING.rst' ([#1127](https://www.github.com/googleapis/python-appengine-admin/issues/1127)) ([#35](https://www.github.com/googleapis/python-appengine-admin/issues/35)) ([34b578c](https://www.github.com/googleapis/python-appengine-admin/commit/34b578c920e8fba4cca1eb0532d357552056d12f)), closes [#1126](https://www.github.com/googleapis/python-appengine-admin/issues/1126)
 
-### [1.0.2](https://www.github.com/googleapis/python-appengine-admin/compare/v1.0.1...v1.0.2) (2021-06-16)
+## [1.0.2](https://www.github.com/googleapis/python-appengine-admin/compare/v1.0.1...v1.0.2) (2021-06-16)
 
 
 ### Bug Fixes
 
 * fix typo in setup.py ([#32](https://www.github.com/googleapis/python-appengine-admin/issues/32)) ([1a749ef](https://www.github.com/googleapis/python-appengine-admin/commit/1a749effe4873c759a1630c0d836bafa193856c6))
 
-### [1.0.1](https://www.github.com/googleapis/python-appengine-admin/compare/v1.0.0...v1.0.1) (2021-06-16)
+## [1.0.1](https://www.github.com/googleapis/python-appengine-admin/compare/v1.0.0...v1.0.1) (2021-06-16)
 
 
 ### Bug Fixes

From b7833f35b9e3b234993b91a26ccda5bc614915de Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Fri, 3 Jun 2022 12:51:50 -0400
Subject: [PATCH 4/5] chore: test minimum dependencies in python 3.7 (#171)

---
 testing/constraints-3.7.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
index e69de29..85fd9f0 100644
--- a/testing/constraints-3.7.txt
+++ b/testing/constraints-3.7.txt
@@ -0,0 +1,11 @@
+# This constraints file is used to check that lower bounds
+# are correct in setup.py
+# List *all* library dependencies and extras in this file.
+# Pin the version to the lower bound.
+#
+# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
+# Then this file should have foo==1.14.0
+google-api-core==1.31.5
+proto-plus==1.18.1
+grpc-google-iam-v1==0.12.4
+protobuf==3.19.0

From c80862d08edd1dc22e03b7dd9e326a759ba32212 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 18:19:47 -0400
Subject: [PATCH 5/5] chore(main): release 1.4.1 (#169)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
---
 CHANGELOG.md | 12 ++++++++++++
 setup.py     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97ab078..2f65ffc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.4.1](https://github.com/googleapis/python-appengine-admin/compare/v1.4.0...v1.4.1) (2022-06-03)
+
+
+### Bug Fixes
+
+* **deps:** require protobuf <4.0.0dev ([#167](https://github.com/googleapis/python-appengine-admin/issues/167)) ([d18523f](https://github.com/googleapis/python-appengine-admin/commit/d18523f1e900cd3d59ab5919629680f1023cb5da))
+
+
+### Documentation
+
+* fix changelog header to consistent size ([#168](https://github.com/googleapis/python-appengine-admin/issues/168)) ([32eb983](https://github.com/googleapis/python-appengine-admin/commit/32eb9839a119be5c9189140e02dd8e2c2798cbf3))
+
 ## [1.4.0](https://github.com/googleapis/python-appengine-admin/compare/v1.3.3...v1.4.0) (2022-05-05)
 
 
diff --git a/setup.py b/setup.py
index 8e2918a..16e2282 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
 import setuptools  # type: ignore
 
 name = "google-cloud-appengine-admin"
-version = "1.4.0"
+version = "1.4.1"
 description = "App Engine Admin API client library"
 release_status = "Development Status :: 5 - Production/Stable"
 url = "https://github.com/googleapis/python-appengine-admin"