From fe009f11bd14205d8a5ea22533765b47cc18ebf2 Mon Sep 17 00:00:00 2001 From: Nipunn Koorapati Date: Mon, 1 Apr 2024 11:37:49 -0700 Subject: [PATCH] Bump protobuf to 4.25.3 --- CHANGELOG.md | 2 ++ README.md | 6 +++--- mypy_protobuf/extensions_pb2.py | 18 +++++++----------- setup.cfg | 4 ++-- test_requirements.txt | 4 ++-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00ff122..eb46d1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Upcoming +- Bump protobuf to 4.25.3 + ## 3.5.0 - Add gRPC aio stub and servicer generation (#489) diff --git a/README.md b/README.md index a1bfe29..bccb090 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ See [Changelog](CHANGELOG.md) for recent changes. Earlier releases might work, but aren't tested - [protoc >= 23.4](https://github.com/protocolbuffers/protobuf/releases) -- [python-protobuf >= 4.23.4](https://pypi.org/project/protobuf/) - matching protoc release +- [python-protobuf >= 4.25.3](https://pypi.org/project/protobuf/) - matching protoc release - [python >= 3.8](https://www.python.org/downloads/source/) - for running mypy-protobuf plugin. ## Requirements to run typecheckers on stubs generated by mypy-protobuf @@ -24,8 +24,8 @@ Earlier releases might work, but aren't tested Earlier releases might work, but aren't tested - [mypy >= v1.4.1](https://pypi.org/project/mypy) or [pyright >= 1.1.206](https://github.com/microsoft/pyright) -- [python-protobuf >= 4.23.4](https://pypi.org/project/protobuf/) - matching protoc release -- [types-protobuf >= 4.23.0.2](https://pypi.org/project/types-protobuf/) - for stubs from the google.protobuf library +- [python-protobuf >= 4.25.3](https://pypi.org/project/protobuf/) - matching protoc release +- [types-protobuf >= 4.24](https://pypi.org/project/types-protobuf/) - for stubs from the google.protobuf library ### To run typecheckers on code generated with grpc plugin - you'll additionally need diff --git a/mypy_protobuf/extensions_pb2.py b/mypy_protobuf/extensions_pb2.py index a638958..5d48735 100644 --- a/mypy_protobuf/extensions_pb2.py +++ b/mypy_protobuf/extensions_pb2.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: mypy_protobuf/extensions.proto +# Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -20,18 +21,13 @@ _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'mypy_protobuf.extensions_pb2', _globals) if _descriptor._USE_C_DESCRIPTORS == False: - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(options) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(casttype) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(keytype) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(valuetype) - DESCRIPTOR._options = None - casttype._options = None - casttype._serialized_options = b'\030\001' - keytype._options = None - keytype._serialized_options = b'\030\001' - valuetype._options = None - valuetype._serialized_options = b'\030\001' + _globals['casttype']._options = None + _globals['casttype']._serialized_options = b'\030\001' + _globals['keytype']._options = None + _globals['keytype']._serialized_options = b'\030\001' + _globals['valuetype']._options = None + _globals['valuetype']._serialized_options = b'\030\001' _globals['_FIELDOPTIONS']._serialized_start=83 _globals['_FIELDOPTIONS']._serialized_end=151 # @@protoc_insertion_point(module_scope) diff --git a/setup.cfg b/setup.cfg index 924b405..8a8b1ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,8 +15,8 @@ py_modules = mypy_protobuf.main mypy_protobuf.extensions_pb2 install_requires = - protobuf>=4.23.4 - types-protobuf>=4.23.0.2 + protobuf>=4.25.3 + types-protobuf>=4.24 python_requires = >=3.8 [options.entry_points] diff --git a/test_requirements.txt b/test_requirements.txt index 974106c..eac899e 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -1,8 +1,8 @@ # Requirements to run unit tests. Tests import from # generated code. -protobuf==4.23.4 +protobuf==4.25.3 pytest==7.3.1 pytest-asyncio==0.20.3 grpc-stubs==1.53.0.2 grpcio-tools==1.56.2 -types-protobuf==4.23.0.2 +types-protobuf==4.24