Update generated code after rebase

Signed-off-by: Aidan Jensen <aidandj.github@gmail.com>

Author: aidandj

mypy_protobuf/main.py

@@ -418,7 +418,7 @@ def write_enum_values(
             scl = scl_prefix + [i]
             # Class level
             if class_attributes and val.options.deprecated:
-                self._write_line("@property")
+                self._write_line(self._property())
                 self._write_deprecation_warning(
                     scl + [d.EnumValueDescriptorProto.OPTIONS_FIELD_NUMBER] + [d.EnumOptions.DEPRECATED_FIELD_NUMBER],
                     "This enum value has been marked as deprecated using proto enum value options.",
@@ -576,7 +576,7 @@ def write_messages(
                         scl_field = scl + [d.DescriptorProto.FIELD_FIELD_NUMBER, idx]
                         deprecation_scl_field = scl_field + [d.FieldDescriptorProto.OPTIONS_FIELD_NUMBER] + [d.FieldOptions.DEPRECATED_FIELD_NUMBER]
                         if field.options.deprecated:
-                            wl("@property")
+                            wl(self._property())
                             self._write_deprecation_warning(
                                 deprecation_scl_field,
                                 "This field has been marked as deprecated using proto field options.",
@@ -966,7 +966,7 @@ def type_str(method: d.MethodDescriptorProto, is_async: bool) -> str:
                 type_annotation = type_str(method, is_async=is_async)
 
             if is_deprecated:
-                wl("@property")
+                wl(self._property())
                 self._write_deprecation_warning(
                     scl + [d.MethodDescriptorProto.OPTIONS_FIELD_NUMBER, d.MethodOptions.DEPRECATED_FIELD_NUMBER],
                     "This method has been marked as deprecated using proto method options.",

pyproject.toml

@@ -13,7 +13,7 @@ line-length = 10000
 [tool.isort]
 profile = "black"
 skip_gitignore = true
-extend_skip_glob = ["*_pb2.py", "*_pb2_grpc.py"]
+extend_skip_glob = ["*_pb2.py"]
 
 [tool.mypy]
 strict = true

test/generated/google/protobuf/api_pb2.pyi

@@ -47,6 +47,11 @@ if sys.version_info >= (3, 10):
 else:
     import typing_extensions as _typing_extensions
 
+if sys.version_info >= (3, 13):
+    from warnings import deprecated as _deprecated
+else:
+    from typing_extensions import deprecated as _deprecated
+
 DESCRIPTOR: _google_protobuf_descriptor.FileDescriptor
 
 @_typing.final
@@ -173,18 +178,42 @@ class Method(_google_protobuf_message.Message):
     """The URL of the output message type."""
     response_streaming: _builtins.bool
     """If true, the response is streamed."""
-    syntax: google.protobuf.type_pb2.Syntax.ValueType
-    """The source syntax of this method.
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def syntax(self) -> google.protobuf.type_pb2.Syntax.ValueType:
+        """The source syntax of this method.
 
-    This field should be ignored, instead the syntax should be inherited from
-    Api. This is similar to Field and EnumValue.
-    """
-    edition: _builtins.str
-    """The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+        This field should be ignored, instead the syntax should be inherited from
+        Api. This is similar to Field and EnumValue.
+        """
+
+    @syntax.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def syntax(self, value: google.protobuf.type_pb2.Syntax.ValueType) -> None:
+        """The source syntax of this method.
+
+        This field should be ignored, instead the syntax should be inherited from
+        Api. This is similar to Field and EnumValue.
+        """
+
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def edition(self) -> _builtins.str:
+        """The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+
+        This field should be ignored, instead the edition should be inherited from
+        Api. This is similar to Field and EnumValue.
+        """
+
+    @edition.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def edition(self, value: _builtins.str) -> None:
+        """The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+
+        This field should be ignored, instead the edition should be inherited from
+        Api. This is similar to Field and EnumValue.
+        """
 
-    This field should be ignored, instead the edition should be inherited from
-    Api. This is similar to Field and EnumValue.
-    """
     @_builtins.property
     def options(self) -> _google_protobuf_internal_containers.RepeatedCompositeFieldContainer[google.protobuf.type_pb2.Option]:
         """Any metadata attached to the method."""

test/generated/google/protobuf/descriptor_pb2.pyi

@@ -24,6 +24,11 @@ if sys.version_info >= (3, 10):
 else:
     import typing_extensions as _typing_extensions
 
+if sys.version_info >= (3, 13):
+    from warnings import deprecated as _deprecated
+else:
+    from typing_extensions import deprecated as _deprecated
+
 DESCRIPTOR: _google_protobuf_descriptor.FileDescriptor
 
 class _Edition:
@@ -979,8 +984,16 @@ class FileOptions(_google_protobuf_message.Message):
     generated to contain the file's getDescriptor() method as well as any
     top-level extensions defined in the file.
     """
-    java_generate_equals_and_hash: _builtins.bool
-    """This option does nothing."""
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def java_generate_equals_and_hash(self) -> _builtins.bool:
+        """This option does nothing."""
+
+    @java_generate_equals_and_hash.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def java_generate_equals_and_hash(self, value: _builtins.bool) -> None:
+        """This option does nothing."""
+
     java_string_check_utf8: _builtins.bool
     """A proto2 file can set this to true to opt in to UTF-8 checking for Java,
     which will throw an exception if invalid UTF-8 is parsed from the wire or
@@ -1167,18 +1180,36 @@ class MessageOptions(_google_protobuf_message.Message):
     instead. The option should only be implicitly set by the proto compiler
     parser.
     """
-    deprecated_legacy_json_field_conflicts: _builtins.bool
-    """Enable the legacy handling of JSON field name conflicts.  This lowercases
-    and strips underscored from the fields before comparison in proto3 only.
-    The new behavior takes `json_name` into account and applies to proto2 as
-    well.
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_legacy_json_field_conflicts(self) -> _builtins.bool:
+        """Enable the legacy handling of JSON field name conflicts.  This lowercases
+        and strips underscored from the fields before comparison in proto3 only.
+        The new behavior takes `json_name` into account and applies to proto2 as
+        well.
+
+        This should only be used as a temporary measure against broken builds due
+        to the change in behavior for JSON field name conflicts.
+
+        TODO This is legacy behavior we plan to remove once downstream
+        teams have had time to migrate.
+        """
 
-    This should only be used as a temporary measure against broken builds due
-    to the change in behavior for JSON field name conflicts.
+    @deprecated_legacy_json_field_conflicts.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_legacy_json_field_conflicts(self, value: _builtins.bool) -> None:
+        """Enable the legacy handling of JSON field name conflicts.  This lowercases
+        and strips underscored from the fields before comparison in proto3 only.
+        The new behavior takes `json_name` into account and applies to proto2 as
+        well.
+
+        This should only be used as a temporary measure against broken builds due
+        to the change in behavior for JSON field name conflicts.
+
+        TODO This is legacy behavior we plan to remove once downstream
+        teams have had time to migrate.
+        """
 
-    TODO This is legacy behavior we plan to remove once downstream
-    teams have had time to migrate.
-    """
     @_builtins.property
     def features(self) -> Global___FeatureSet:
         """Any features defined in the specific edition.
@@ -1463,10 +1494,20 @@ class FieldOptions(_google_protobuf_message.Message):
     for accessors, or it will be completely ignored; in the very least, this
     is a formalization for deprecating fields.
     """
-    weak: _builtins.bool
-    """DEPRECATED. DO NOT USE!
-    For Google-internal migration only. Do not use.
-    """
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def weak(self) -> _builtins.bool:
+        """DEPRECATED. DO NOT USE!
+        For Google-internal migration only. Do not use.
+        """
+
+    @weak.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def weak(self, value: _builtins.bool) -> None:
+        """DEPRECATED. DO NOT USE!
+        For Google-internal migration only. Do not use.
+        """
+
     debug_redact: _builtins.bool
     """Indicate that the field value should not be printed out when using debug
     formats, e.g. when the field contains sensitive credentials.
@@ -1565,14 +1606,28 @@ class EnumOptions(_google_protobuf_message.Message):
     for the enum, or it will be completely ignored; in the very least, this
     is a formalization for deprecating enums.
     """
-    deprecated_legacy_json_field_conflicts: _builtins.bool
-    """Enable the legacy handling of JSON field name conflicts.  This lowercases
-    and strips underscored from the fields before comparison in proto3 only.
-    The new behavior takes `json_name` into account and applies to proto2 as
-    well.
-    TODO Remove this legacy behavior once downstream teams have
-    had time to migrate.
-    """
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_legacy_json_field_conflicts(self) -> _builtins.bool:
+        """Enable the legacy handling of JSON field name conflicts.  This lowercases
+        and strips underscored from the fields before comparison in proto3 only.
+        The new behavior takes `json_name` into account and applies to proto2 as
+        well.
+        TODO Remove this legacy behavior once downstream teams have
+        had time to migrate.
+        """
+
+    @deprecated_legacy_json_field_conflicts.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_legacy_json_field_conflicts(self, value: _builtins.bool) -> None:
+        """Enable the legacy handling of JSON field name conflicts.  This lowercases
+        and strips underscored from the fields before comparison in proto3 only.
+        The new behavior takes `json_name` into account and applies to proto2 as
+        well.
+        TODO Remove this legacy behavior once downstream teams have
+        had time to migrate.
+        """
+
     @_builtins.property
     def features(self) -> Global___FeatureSet:
         """Any features defined in the specific edition.

test/generated/google/protobuf/edition_unittest_pb2.pyi

@@ -748,11 +748,23 @@ class TestDeprecatedFields(_google_protobuf_message.Message):
     DEPRECATED_MESSAGE_FIELD_NUMBER: _builtins.int
     DEPRECATED_INT32_IN_ONEOF_FIELD_NUMBER: _builtins.int
     NESTED_FIELD_NUMBER: _builtins.int
-    deprecated_int32: _builtins.int
-    deprecated_int32_in_oneof: _builtins.int
     @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32(self) -> _builtins.int: ...
+    @deprecated_int32.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32(self, value: _builtins.int) -> None: ...
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32_in_oneof(self) -> _builtins.int: ...
+    @deprecated_int32_in_oneof.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32_in_oneof(self, value: _builtins.int) -> None: ...
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
     def deprecated_repeated_string(self) -> _google_protobuf_internal_containers.RepeatedScalarFieldContainer[_builtins.str]: ...
     @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
     def deprecated_message(self) -> Global___TestAllTypes.NestedMessage: ...
     @_builtins.property
     def nested(self) -> Global___TestDeprecatedFields: ...

test/generated/google/protobuf/unittest_lite_pb2.pyi

@@ -23,6 +23,11 @@ if sys.version_info >= (3, 10):
 else:
     import typing_extensions as _typing_extensions
 
+if sys.version_info >= (3, 13):
+    from warnings import deprecated as _deprecated
+else:
+    from typing_extensions import deprecated as _deprecated
+
 DESCRIPTOR: _google_protobuf_descriptor.FileDescriptor
 
 class _ForeignEnumLite:
@@ -627,10 +632,26 @@ class TestDeprecatedLite(_google_protobuf_message.Message):
     DEPRECATED_FIELD2_FIELD_NUMBER: _builtins.int
     DEPRECATED_FIELD3_FIELD_NUMBER: _builtins.int
     DEPRECATED_FIELD4_FIELD_NUMBER: _builtins.int
-    deprecated_field: _builtins.int
-    deprecated_field2: _builtins.int
-    deprecated_field3: _builtins.str
     @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_field(self) -> _builtins.int: ...
+    @deprecated_field.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_field(self, value: _builtins.int) -> None: ...
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_field2(self) -> _builtins.int: ...
+    @deprecated_field2.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_field2(self, value: _builtins.int) -> None: ...
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_field3(self) -> _builtins.str: ...
+    @deprecated_field3.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_field3(self, value: _builtins.str) -> None: ...
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
     def deprecated_field4(self) -> Global___TestDeprecatedLite: ...
     def __init__(
         self,

test/generated/google/protobuf/unittest_pb2.pyi

@@ -772,11 +772,23 @@ class TestDeprecatedFields(_google_protobuf_message.Message):
     DEPRECATED_MESSAGE_FIELD_NUMBER: _builtins.int
     DEPRECATED_INT32_IN_ONEOF_FIELD_NUMBER: _builtins.int
     NESTED_FIELD_NUMBER: _builtins.int
-    deprecated_int32: _builtins.int
-    deprecated_int32_in_oneof: _builtins.int
     @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32(self) -> _builtins.int: ...
+    @deprecated_int32.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32(self, value: _builtins.int) -> None: ...
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32_in_oneof(self) -> _builtins.int: ...
+    @deprecated_int32_in_oneof.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def deprecated_int32_in_oneof(self, value: _builtins.int) -> None: ...
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
     def deprecated_repeated_string(self) -> _google_protobuf_internal_containers.RepeatedScalarFieldContainer[_builtins.str]: ...
     @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
     def deprecated_message(self) -> Global___TestAllTypes.NestedMessage: ...
     @_builtins.property
     def nested(self) -> Global___TestDeprecatedFields: ...

test/generated/google/protobuf/unittest_redaction_pb2.pyi

@@ -20,6 +20,11 @@ if sys.version_info >= (3, 10):
 else:
     import typing_extensions as _typing_extensions
 
+if sys.version_info >= (3, 13):
+    from warnings import deprecated as _deprecated
+else:
+    from typing_extensions import deprecated as _deprecated
+
 DESCRIPTOR: _google_protobuf_descriptor.FileDescriptor
 
 class _MetaAnnotatedEnum:
@@ -138,7 +143,12 @@ class TestRedactedMessage(_google_protobuf_message.Message):
     TEST_DIRECT_MESSAGE_ENUM_FIELD_NUMBER: _builtins.int
     TEST_NESTED_MESSAGE_ENUM_FIELD_NUMBER: _builtins.int
     TEST_REDACTED_MESSAGE_ENUM_FIELD_NUMBER: _builtins.int
-    text_field: _builtins.str
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def text_field(self) -> _builtins.str: ...
+    @text_field.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def text_field(self, value: _builtins.str) -> None: ...
     meta_annotated: _builtins.str
     repeated_meta_annotated: _builtins.str
     unredacted_repeated_annotations: _builtins.str

test/generated/testproto/grpc/dummy_pb2.pyi

@@ -59,7 +59,12 @@ class DeprecatedRequest(_google_protobuf_message.Message):
     DESCRIPTOR: _google_protobuf_descriptor.Descriptor
 
     OLD_FIELD_FIELD_NUMBER: _builtins.int
-    old_field: _builtins.str
+    @_builtins.property
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def old_field(self) -> _builtins.str: ...
+    @old_field.setter
+    @_deprecated("""This field has been marked as deprecated using proto field options.""")
+    def old_field(self, value: _builtins.str) -> None: ...
     def __init__(
         self,
         *,