From b9ff9d476d25fbfba7c88d454cccaf4b4ec5e659 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Mon, 14 Feb 2022 16:01:39 -0500 Subject: [PATCH 1/4] chore: allow release-please to make releases (#298) --- .github/release-please.yml | 1 + .github/release-trigger.yml | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 .github/release-trigger.yml diff --git a/.github/release-please.yml b/.github/release-please.yml index 4507ad05..466597e5 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1 +1,2 @@ releaseType: python +handleGHRelease: true diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 00000000..1e9cfcd3 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1,2 @@ +enabled: true + From 71591e1c09aa33fc8096ddeee29dff940aa7b1f7 Mon Sep 17 00:00:00 2001 From: Anurag Kumar Date: Tue, 15 Feb 2022 04:45:01 +0530 Subject: [PATCH 2/4] chore: add classifier for python 3.10 (#283) Co-authored-by: Anthonios Partheniou --- .github/workflows/tests.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 282fe7fa..eb1c51d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.6, 3.7, 3.8, 3.9] + python: ['3.6', '3.7', '3.8', '3.9', '3.10'] variant: ['', cpp] steps: - name: Cancel Previous Runs diff --git a/setup.py b/setup.py index cf76c368..a259f8bf 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,7 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Topic :: Software Development :: Code Generators", "Topic :: Software Development :: Libraries :: Python Modules", ], From 80dcce9099e630a6217792b6b3a14213add690e6 Mon Sep 17 00:00:00 2001 From: Dov Shlachter Date: Thu, 17 Feb 2022 10:29:44 -0800 Subject: [PATCH 3/4] fix: dir(proto.Message) does not raise (#302) dir(proto.Message) defaults to dir(type) --- proto/message.py | 37 ++++++++++++++++++++----------------- tests/test_message.py | 4 ++++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/proto/message.py b/proto/message.py index 7293fdb5..de9280da 100644 --- a/proto/message.py +++ b/proto/message.py @@ -274,25 +274,28 @@ def meta(cls): return cls._meta def __dir__(self): - names = set(dir(type)) - names.update( - ( - "meta", - "pb", - "wrap", - "serialize", - "deserialize", - "to_json", - "from_json", - "to_dict", - "copy_from", + try: + names = set(dir(type)) + names.update( + ( + "meta", + "pb", + "wrap", + "serialize", + "deserialize", + "to_json", + "from_json", + "to_dict", + "copy_from", + ) ) - ) - desc = self.pb().DESCRIPTOR - names.update(t.name for t in desc.nested_types) - names.update(e.name for e in desc.enum_types) + desc = self.pb().DESCRIPTOR + names.update(t.name for t in desc.nested_types) + names.update(e.name for e in desc.enum_types) - return names + return names + except AttributeError: + return dir(type) def pb(cls, obj=None, *, coerce: bool = False): """Return the underlying protobuf Message class or instance. diff --git a/tests/test_message.py b/tests/test_message.py index 843fad22..3146f0bb 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -415,3 +415,7 @@ class Arm(proto.Message): actual = set(dir(Mollusc)) assert actual == expected + + +def test_dir_message_base(): + assert set(dir(proto.Message)) == set(dir(type)) From 06d062087bc33ceaf98647bb128954ec17256ac0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:58:35 -0800 Subject: [PATCH 4/4] chore(main): release 1.20.2 (#303) 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 ba85476f..ffc8a7c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.20.2](https://github.com/googleapis/proto-plus-python/compare/v1.20.1...v1.20.2) (2022-02-17) + + +### Bug Fixes + +* dir(proto.Message) does not raise ([#302](https://github.com/googleapis/proto-plus-python/issues/302)) ([80dcce9](https://github.com/googleapis/proto-plus-python/commit/80dcce9099e630a6217792b6b3a14213add690e6)) + ### [1.20.1](https://github.com/googleapis/proto-plus-python/compare/v1.20.0...v1.20.1) (2022-02-14) diff --git a/setup.py b/setup.py index a259f8bf..109d0b90 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ from setuptools import find_packages, setup -version = "1.20.1" +version = "1.20.2" PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))