Skip to content

Commit

Permalink
Remove editions test proto from setup.py.
Browse files Browse the repository at this point in the history
This proto is only used in C++ tests, and doesn't need to be built in python.  Python doesn't support editions yet, so we should just remove it for now.  This also fixes some other issues with setup.py where tests fail.

Closes #13501

PiperOrigin-RevId: 555681295
  • Loading branch information
mkruskal-google authored and copybara-github committed Aug 10, 2023
1 parent e7bb34d commit 2eee412
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions python/google/protobuf/internal/descriptor_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
message ResponseMessage {
}
service Service {
service DescriptorTestService {
rpc CallMethod(.protobuf_unittest.NestedMessage) returns (.protobuf_unittest.ResponseMessage);
}
Expand Down Expand Up @@ -97,8 +97,7 @@ def setUp(self):
enum_proto.value.add(name='FOREIGN_BAZ', number=6)

file_proto.message_type.add(name='ResponseMessage')
service_proto = file_proto.service.add(
name='Service')
service_proto = file_proto.service.add(name='DescriptorTestService')
method_proto = service_proto.method.add(
name='CallMethod',
input_type='.protobuf_unittest.NestedMessage',
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ def GenerateUnittestProtos():
GenProto('../src/google/protobuf/map_unittest.proto', False)
GenProto('../src/google/protobuf/test_messages_proto3.proto', False)
GenProto('../src/google/protobuf/test_messages_proto2.proto', False)
GenProto('../src/google/protobuf/unittest_arena.proto', False)
GenProto('../src/google/protobuf/unittest.proto', False)
GenProto('../src/google/protobuf/unittest_custom_options.proto', False)
GenProto('../src/google/protobuf/unittest_import.proto', False)
Expand All @@ -140,6 +139,7 @@ def GenerateUnittestProtos():
GenProto('../src/google/protobuf/unittest_mset_wire_format.proto', False)
GenProto('../src/google/protobuf/unittest_no_generic_services.proto', False)
GenProto('../src/google/protobuf/unittest_proto3_arena.proto', False)
GenProto('../src/google/protobuf/unittest_retention.proto', False)
GenProto('../src/google/protobuf/util/json_format.proto', False)
GenProto('../src/google/protobuf/util/json_format_proto3.proto', False)
GenProto('google/protobuf/internal/any_test.proto', False)
Expand Down

0 comments on commit 2eee412

Please sign in to comment.