From 6515b7777cc0de034b4b778914badd32cf29da20 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 21 Sep 2020 16:42:51 -0700 Subject: [PATCH 1/3] chore: add CODEOWNERS and repo sync config (#607) --- .github/CODEOWNERS | 7 ++++++ .github/sync-repo-settings.yaml | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 .github/CODEOWNERS create mode 100644 .github/sync-repo-settings.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000000..aaabff6ec1 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,7 @@ +# Code owners file. +# This file controls who is tagged for review for any given pull request. + +# For syntax help see: +# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax + +* @googleapis/actools @googleapis/yoshi-python diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml new file mode 100644 index 0000000000..d0e56dcae8 --- /dev/null +++ b/.github/sync-repo-settings.yaml @@ -0,0 +1,38 @@ +rebaseMergeAllowed: true +squashMergeAllowed: true +mergeCommitAllowed: false +branchProtectionRules: +- pattern: master + isAdminEnforced: true + requiredStatusCheckContexts: + - 'ci/circleci: docs' + - 'ci/circleci: mypy' + - 'ci/circleci: showcase' + - 'ci/circleci: showcase-alternative-templates' + - 'ci/circleci: showcase-mtls' + - 'ci/circleci: showcase-mtls-alternative-templates' + - 'ci/circleci: showcase-mypy' + - 'ci/circleci: showcase-mypy-alternative-templates' + - 'ci/circleci: showcase-unit-3.6' + - 'ci/circleci: showcase-unit-3.7' + - 'ci/circleci: showcase-unit-3.8' + - 'ci/circleci: showcase-unit-add-iam-methods' + - 'ci/circleci: showcase-unit-alternative-templates-3.6' + - 'ci/circleci: showcase-unit-alternative-templates-3.7' + - 'ci/circleci: showcase-unit-alternative-templates-3.8' + - 'ci/circleci: style-check' + - 'ci/circleci: unit-3.6' + - 'ci/circleci: unit-3.7' + - 'ci/circleci: unit-3.8' + - 'cla/google' + - 'codecov/patch' + - 'codecov/project' + - 'conventionalcommits.org' + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true +permissionRules: + - team: actools + permission: admin + - team: yoshi-python + permission: push From 8338a51a81f5f5b8ebacf68c8e46d3e1804d3f8b Mon Sep 17 00:00:00 2001 From: Dov Shlachter Date: Tue, 22 Sep 2020 12:49:57 -0700 Subject: [PATCH 2/3] fix: remove 'property' from reserved names (#613) The Python 'property' builtin name should not be reserved. --- gapic/utils/reserved_names.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gapic/utils/reserved_names.py b/gapic/utils/reserved_names.py index 14958fc52f..3d1e9b4459 100644 --- a/gapic/utils/reserved_names.py +++ b/gapic/utils/reserved_names.py @@ -17,13 +17,11 @@ import keyword -# The filter and map builtins are a historical artifact; -# they are not used in modern, idiomatic python, -# nor are they used in the gapic surface. -# They are too useful to reserve. +# The exceptions to builtins are frequent and useful. +# They are explicitly allowed message, module, and field names. RESERVED_NAMES = frozenset( itertools.chain( keyword.kwlist, - set(dir(builtins)) - {"filter", "map", "id"}, + set(dir(builtins)) - {"filter", "map", "id", "property"}, ) ) From 358ca167074d65be99de1bd9953eed749c647311 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 12:55:11 -0700 Subject: [PATCH 3/3] chore: release 0.33.5 (#614) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a844d1d5e8..c89b8a9b00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.33.5](https://www.github.com/googleapis/gapic-generator-python/compare/v0.33.4...v0.33.5) (2020-09-22) + + +### Bug Fixes + +* remove 'property' from reserved names ([#613](https://www.github.com/googleapis/gapic-generator-python/issues/613)) ([8338a51](https://www.github.com/googleapis/gapic-generator-python/commit/8338a51a81f5f5b8ebacf68c8e46d3e1804d3f8b)) + ### [0.33.4](https://www.github.com/googleapis/gapic-generator-python/compare/v0.33.3...v0.33.4) (2020-09-17) diff --git a/setup.py b/setup.py index 5a3ccbc1ab..6d4509a457 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) -version = "0.33.4" +version = "0.33.5" with io.open(os.path.join(PACKAGE_ROOT, "README.rst")) as file_obj: README = file_obj.read()