Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add support for Python 3.11 #329

Merged
merged 18 commits into from
Jan 5, 2023
Merged

fix: Add support for Python 3.11 #329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
468c93e
Adjust to enum changes in Python 3.11.0b3
hroncok Jun 28, 2022
b337126
Merge branch 'main' into python3.11
parthea Jul 2, 2022
b201662
ci: unit test session with python 3.11.0-beta.3
parthea Jul 2, 2022
c7371b4
ci: add python v3.11.0-beta.3 to noxfile.py
parthea Jul 2, 2022
7672b52
another attempt to get python 3.11.0b3 working in github actions
parthea Jul 2, 2022
280f9d2
ci: use python 3.8 for docs check
parthea Jul 2, 2022
9f56d97
ci: fix docs build
parthea Jul 2, 2022
b85f9c3
Merge branch 'main' into python3.11
parthea Jul 15, 2022
ff677c5
Merge branch 'main' into python3.11
parthea Aug 10, 2022
94d6b26
Merge branch 'main' into python3.11
parthea Jan 5, 2023
20acd08
fix ci
parthea Jan 5, 2023
f635f9c
mark python 3.11 tests as required
parthea Jan 5, 2023
a1331bb
add python 3.11 to setup.py
parthea Jan 5, 2023
1728f48
fix docs build
parthea Jan 5, 2023
880a952
remove python 3.11 test for unitcpp
parthea Jan 5, 2023
85b92fe
remove python 3.11 test for unitcpp
parthea Jan 5, 2023
2b25b4f
remove python 3.11 test for unitcpp
parthea Jan 5, 2023
8ee3eed
attempt to fix exclude in github action
parthea Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions proto/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ def __new__(mcls, name, bases, attrs):
# In 3.7 onwards, we can define an _ignore_ attribute and do some
# mucking around with that.
if pb_options in attrs._member_names:
idx = attrs._member_names.index(pb_options)
attrs._member_names.pop(idx)
if isinstance(attrs._member_names, list):
idx = attrs._member_names.index(pb_options)
attrs._member_names.pop(idx)
else: # Python 3.11.0b3
del attrs._member_names[pb_options]

# Make the descriptor.
enum_desc = descriptor_pb2.EnumDescriptorProto(
Expand Down
6 changes: 5 additions & 1 deletion tests/test_enum_total_ordering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ def test_total_ordering_w_other_enum_type():

for item in enums_test.OtherEnum:
assert not to_compare == item
assert to_compare.SOME_VALUE != item
assert type(to_compare).SOME_VALUE != item
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to_compare is already OneEnum.SOME_VALUE -- so what is the purpose of the indirect reference through itself? Can this part of the test just be dropped?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this entire assertion here seemed redundant to me as well, but I decided to keep testing what was tested.

Note that I am not available to fine-tune this into perfection, that's why I posted the patch in a comment initially as "this makes it pass" instead of opening a PR right away.

try:
assert to_compare.SOME_VALUE != item
except AttributeError: # Python 3.11.0b3
pass
with pytest.raises(TypeError):
assert not to_compare < item
with pytest.raises(TypeError):
Expand Down