From a2769c6f5e783a4ce5c53cab1d983730c5130c12 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 18:04:14 +0000 Subject: [PATCH 1/5] chore: use gapic-generator-python 1.0.0 (#154) - [ ] 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 --- owlbot.py | 2 +- tests/unit/gapic/orgpolicy_v2/test_org_policy.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/owlbot.py b/owlbot.py index 0d0ecb0..49b5148 100644 --- a/owlbot.py +++ b/owlbot.py @@ -36,7 +36,7 @@ "google-cloud-org-policy" ) - s.move(library, excludes=["setup.py", "README.rst", "docs/index.rst"]) + s.move(library, excludes=["setup.py", "README.rst", "docs/index.rst", "noxfile.py"]) s.remove_staging_dirs() diff --git a/tests/unit/gapic/orgpolicy_v2/test_org_policy.py b/tests/unit/gapic/orgpolicy_v2/test_org_policy.py index f130be6..4b0a04e 100644 --- a/tests/unit/gapic/orgpolicy_v2/test_org_policy.py +++ b/tests/unit/gapic/orgpolicy_v2/test_org_policy.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 50c659fd79f2f663a5988239846773019aea08e0 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 1 Jun 2022 22:37:59 -0400 Subject: [PATCH 2/5] fix(deps): require protobuf <4.0.0dev (#155) --- setup.py | 3 ++- testing/constraints-3.6.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 98d0ea5..f57d848 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,8 @@ # 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.15.0", + "proto-plus >= 1.15.0, <2.0.0dev", + "protobuf >= 3.19.0, <4.0.0dev", ), python_requires=">=3.6", classifiers=[ diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index fe87928..e96de94 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -21,3 +21,4 @@ # Then this file should have foo==1.14.0 google-api-core==1.31.5 proto-plus==1.15.0 +protobuf==3.19.0 From 9231917a644d0a1fe047db255269c7886eeb50c6 Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Thu, 2 Jun 2022 20:27:10 -0400 Subject: [PATCH 3/5] docs: fix changelog header to consistent size (#156) Co-authored-by: Anthonios Partheniou --- CHANGELOG.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a66cee..4f10ce8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ # Changelog -### [1.3.2](https://github.com/googleapis/python-org-policy/compare/v1.3.1...v1.3.2) (2022-05-26) +## [1.3.2](https://github.com/googleapis/python-org-policy/compare/v1.3.1...v1.3.2) (2022-05-26) ### Bug Fixes * regenerate pb2 files using grpcio-tools ([#152](https://github.com/googleapis/python-org-policy/issues/152)) ([e88e34c](https://github.com/googleapis/python-org-policy/commit/e88e34cbd3edfd918d71aed25290ae0df4e471db)) -### [1.3.1](https://github.com/googleapis/python-org-policy/compare/v1.3.0...v1.3.1) (2022-03-05) +## [1.3.1](https://github.com/googleapis/python-org-policy/compare/v1.3.0...v1.3.1) (2022-03-05) ### Bug Fixes @@ -34,7 +34,7 @@ * add generated snippets ([#118](https://github.com/googleapis/python-org-policy/issues/118)) ([dae6c2c](https://github.com/googleapis/python-org-policy/commit/dae6c2cc9b3b32ddf751aabd4b0d690003f24bef)) -### [1.2.1](https://www.github.com/googleapis/python-org-policy/compare/v1.2.0...v1.2.1) (2021-11-01) +## [1.2.1](https://www.github.com/googleapis/python-org-policy/compare/v1.2.0...v1.2.1) (2021-11-01) ### Bug Fixes @@ -66,14 +66,14 @@ * improper types in pagers generation ([3254812](https://www.github.com/googleapis/python-org-policy/commit/3254812ce2adeb32fe44536c3859c44756bd0c89)) -### [1.0.2](https://www.github.com/googleapis/python-org-policy/compare/v1.0.1...v1.0.2) (2021-09-24) +## [1.0.2](https://www.github.com/googleapis/python-org-policy/compare/v1.0.1...v1.0.2) (2021-09-24) ### Bug Fixes * add 'dict' annotation type to 'request' ([c2ea337](https://www.github.com/googleapis/python-org-policy/commit/c2ea337f06189254eeaec9e60fbf273b38e9f2d8)) -### [1.0.1](https://www.github.com/googleapis/python-org-policy/compare/v1.0.0...v1.0.1) (2021-07-26) +## [1.0.1](https://www.github.com/googleapis/python-org-policy/compare/v1.0.0...v1.0.1) (2021-07-26) ### Bug Fixes @@ -132,14 +132,14 @@ * add v2 ([#21](https://www.github.com/googleapis/python-org-policy/issues/21)) ([8aaa847](https://www.github.com/googleapis/python-org-policy/commit/8aaa8472df478be10b43b34b4346084131c6e465)) -### [0.1.2](https://www.github.com/googleapis/python-org-policy/compare/v0.1.1...v0.1.2) (2020-05-08) +## [0.1.2](https://www.github.com/googleapis/python-org-policy/compare/v0.1.1...v0.1.2) (2020-05-08) ### Bug Fixes * add missing __init__.py ([b786474](https://www.github.com/googleapis/python-org-policy/commit/b78647490341488d3264346ef19d8c7a28f48a06)) -### [0.1.1](https://www.github.com/googleapis/python-org-policy/compare/v0.1.0...v0.1.1) (2020-05-08) +## [0.1.1](https://www.github.com/googleapis/python-org-policy/compare/v0.1.0...v0.1.1) (2020-05-08) ### Bug Fixes From d15efb2a86656c7b9e1c3432b08b819028e53377 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 3 Jun 2022 12:57:06 -0400 Subject: [PATCH 4/5] chore: test minimum dependencies in python 3.7 (#159) --- testing/constraints-3.7.txt | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index da93009..e96de94 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -1,2 +1,24 @@ -# This constraints file is left inentionally empty -# so the latest version of dependencies is installed \ No newline at end of file +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# 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.15.0 +protobuf==3.19.0 From 7eb16e8bb4dd90c52e512240be531c458985392a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 17:21:50 -0400 Subject: [PATCH 5/5] chore(main): release 1.3.3 (#157) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou --- CHANGELOG.md | 12 ++++++++++++ setup.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f10ce8..7b7a127 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.3.3](https://github.com/googleapis/python-org-policy/compare/v1.3.2...v1.3.3) (2022-06-03) + + +### Bug Fixes + +* **deps:** require protobuf <4.0.0dev ([#155](https://github.com/googleapis/python-org-policy/issues/155)) ([50c659f](https://github.com/googleapis/python-org-policy/commit/50c659fd79f2f663a5988239846773019aea08e0)) + + +### Documentation + +* fix changelog header to consistent size ([#156](https://github.com/googleapis/python-org-policy/issues/156)) ([9231917](https://github.com/googleapis/python-org-policy/commit/9231917a644d0a1fe047db255269c7886eeb50c6)) + ## [1.3.2](https://github.com/googleapis/python-org-policy/compare/v1.3.1...v1.3.2) (2022-05-26) diff --git a/setup.py b/setup.py index f57d848..bfcdfeb 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ import os import setuptools # type: ignore -version = "1.3.2" +version = "1.3.3" package_root = os.path.abspath(os.path.dirname(__file__))