Revert protobuf compilation changes

RELEASING.md

@@ -5,46 +5,6 @@
 * [gitchub_changelog_generator](https://github.com/github-changelog-generator)
 * [github access token](https://github.com/github-changelog-generator/github-changelog-generator#github-token)
 
-## Updating protobuf version
-
-Skip this part under normal circumstances.
-Only required if protobuf minimum depencey is updated.
-
-### Update protobuf version
-
-```bash
-export PROTOBUF_VERSION=x.x.0
-uv add "protobuf>$PROTOBUF_VERSION"
-uv add --dev "types-protobuf>$PROTOBUF_VERSION"
-```
-
-### Download and unzip latest protoc compiler
-
-Replace download url with correct version/platform
-
-```bash
-cd /var/tmp
-wget https://github.com/protocolbuffers/protobuf/releases/download/v28.0/protoc-28.0-linux-x86_64.zip
-unzip protoc-28.0-linux-x86_64.zip
-sudo cp bin/protoc /usr/local/bin/
-cd <project-dir>
-protoc --version # check version as expected
-```
-
-### Update generated python files
-
-```bash
-export PROTO_DIR="firebase_messaging/proto"
-protoc --proto_path=$PROTO_DIR --python_out=$PROTO_DIR $PROTO_DIR/android_checkin.proto $PROTO_DIR/checkin.proto $PROTO_DIR/mcs.proto
-protoc --proto_path=$PROTO_DIR --pyi_out=$PROTO_DIR $PROTO_DIR/android_checkin.proto $PROTO_DIR/checkin.proto $PROTO_DIR/mcs.proto
-```
-
-### Fix relative import
-
-`protoc` doesn't do relative imports https://github.com/protocolbuffers/protobuf/issues/1491
-
-In `checkin_pb2.py` and `checkin_pb2.pyi` put `from . ` in front of `import android_checkin_pb2 ...`
-
 ## Export changelog token
 
 ```bash
@@ -189,3 +149,44 @@ git push origin $NEW_RELEASE
 ### Approve the release workflow
 
 This will automatically deploy to pypi
+
+
+## Updating protobuf version
+
+Skip this part under normal circumstances.
+Only required if protobuf minimum dependency is updated.
+
+### Update protobuf version
+
+```bash
+export PROTOBUF_VERSION=x.x.0
+uv add "protobuf>$PROTOBUF_VERSION"
+uv add --dev "types-protobuf>$PROTOBUF_VERSION"
+```
+
+### Download and unzip latest protoc compiler
+
+Replace download url with correct version/platform
+
+```bash
+cd /var/tmp
+wget https://github.com/protocolbuffers/protobuf/releases/download/v28.0/protoc-28.0-linux-x86_64.zip
+unzip protoc-28.0-linux-x86_64.zip
+sudo cp bin/protoc /usr/local/bin/
+cd <project-dir>
+protoc --version # check version as expected
+```
+
+### Update generated python files
+
+```bash
+export PROTO_DIR="firebase_messaging/proto"
+protoc --proto_path=$PROTO_DIR --python_out=$PROTO_DIR $PROTO_DIR/android_checkin.proto $PROTO_DIR/checkin.proto $PROTO_DIR/mcs.proto
+protoc --proto_path=$PROTO_DIR --pyi_out=$PROTO_DIR $PROTO_DIR/android_checkin.proto $PROTO_DIR/checkin.proto $PROTO_DIR/mcs.proto
+```
+
+### Fix relative import
+
+`protoc` doesn't do relative imports https://github.com/protocolbuffers/protobuf/issues/1491
+
+In `checkin_pb2.py` and `checkin_pb2.pyi` put `from . ` in front of `import android_checkin_pb2 ...`

firebase_messaging/fcmpushclient.py

@@ -27,20 +27,18 @@
     MCS_SELECTIVE_ACK_ID,
     MCS_VERSION,
 )
-from .fcmregister import FcmRegister, FcmRegisterConfig, catch_protobuf_warnings
-
-with catch_protobuf_warnings():
-    from .proto.mcs_pb2 import (  # pylint: disable=no-name-in-module
-        Close,
-        DataMessageStanza,
-        HeartbeatAck,
-        HeartbeatPing,
-        IqStanza,
-        LoginRequest,
-        LoginResponse,
-        SelectiveAck,
-        StreamErrorStanza,
-    )
+from .fcmregister import FcmRegister, FcmRegisterConfig
+from .proto.mcs_pb2 import (  # pylint: disable=no-name-in-module
+    Close,
+    DataMessageStanza,
+    HeartbeatAck,
+    HeartbeatPing,
+    IqStanza,
+    LoginRequest,
+    LoginResponse,
+    SelectiveAck,
+    StreamErrorStanza,
+)
 
 _logger = logging.getLogger(__name__)
 

firebase_messaging/fcmregister.py

@@ -7,10 +7,7 @@
 import secrets
 import time
 import uuid
-import warnings
 from base64 import b64encode, urlsafe_b64encode
-from collections.abc import Iterator
-from contextlib import contextmanager
 from dataclasses import dataclass
 from typing import Any, Callable
 
@@ -29,40 +26,15 @@
     GCM_SERVER_KEY_B64,
     SDK_VERSION,
 )
-
-
-@contextmanager
-def catch_protobuf_warnings() -> Iterator[None]:
-    """Catch excessive protobuf warnings due to incorrect greater than check.
-
-    See https://github.com/protocolbuffers/protobuf/issues/18096
-    and https://protobuf.dev/support/cross-version-runtime-guarantee/#minor.
-    """
-    match = (
-        r"^Protobuf gencode version \d+\.\d+\.\d+ is older than the runtime version"
-        r" \d+\.\d+\.\d+ at .*\.proto\. Please avoid checked-in Protobuf gencode "
-        r"that can be obsolete\.$"
-    )
-    with warnings.catch_warnings():
-        warnings.filterwarnings(
-            "ignore",
-            category=UserWarning,
-            module="google.protobuf.runtime_version",
-            message=match,
-        )
-        yield
-
-
-with catch_protobuf_warnings():
-    from .proto.android_checkin_pb2 import (
-        DEVICE_CHROME_BROWSER,
-        AndroidCheckinProto,
-        ChromeBuildProto,
-    )
-    from .proto.checkin_pb2 import (
-        AndroidCheckinRequest,
-        AndroidCheckinResponse,
-    )
+from .proto.android_checkin_pb2 import (
+    DEVICE_CHROME_BROWSER,
+    AndroidCheckinProto,
+    ChromeBuildProto,
+)
+from .proto.checkin_pb2 import (
+    AndroidCheckinRequest,
+    AndroidCheckinResponse,
+)
 
 _logger = logging.getLogger(__name__)