Remove editions test proto from setup.py.

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
pull/13519/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent e7bb34db3c
commit 2eee41224e
  1. 5
      python/google/protobuf/internal/descriptor_test.py
  2. 2
      python/setup.py

@ -67,7 +67,7 @@ message NestedMessage {
message ResponseMessage {
}
service Service {
service DescriptorTestService {
rpc CallMethod(.protobuf_unittest.NestedMessage) returns (.protobuf_unittest.ResponseMessage);
}
@ -97,8 +97,7 @@ class DescriptorTest(unittest.TestCase):
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',

@ -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)
@ -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)

Loading…
Cancel
Save