Skip to content

Commit 0004923

Browse files
committed
Bump protobuf 4.25.8 → 5.29.6 and regenerate gRPC bindings
Update grpcio/grpcio-tools to 1.74.0/1.71.2, google-cloud-pubsub, and tink to versions compatible with protobuf 5.x. Relax google-cloud-kms, grpcio-health-checking, grpcio-reflection, and grpcio-status from exact pins to floor constraints. Unify the grpcio platform split into a single pin. google-cloud-logging is not bumped here: it (along with google-cloud-secret-manager, google-cloud-appengine-logging, and google-cloud-audit-log) was dropped as an unused Discord-era dependency by #391 while this branch was in flight, so there's nothing left to upgrade. Regenerate all *_pb2.py files via ./gen-protos.sh. Test plan: ./run-tests.sh
1 parent 5ab1d79 commit 0004923

39 files changed

Lines changed: 1157 additions & 477 deletions

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ For more information about each release including git tags and artifacts, see [R
3232
- Event stream shows sensible defaults so first-load isn't empty ([#297](https://github.com/roostorg/osprey/pull/297) by [@haileyok](https://github.com/haileyok))
3333
- Replace `react-scripts` with `rsbuild`/`rspack` for UI builds ([#235](https://github.com/roostorg/osprey/pull/235) by [@chimosky](https://github.com/chimosky))
3434
- Migrate from npm to pnpm via Corepack ([#252](https://github.com/roostorg/osprey/pull/252) by [@haileyok](https://github.com/haileyok))
35+
- Upgrade `protobuf` from 4.25.8 to 5.29.6 ([#317](https://github.com/roostorg/osprey/issues/317), [#349](https://github.com/roostorg/osprey/pull/349) by [@reitblatt](https://github.com/reitblatt)); as a downstream consequence, also upgrade
36+
- `grpcio` from 1.49.1/1.53.x to 1.74.0
37+
- `grpcio-tools` from 1.49.1/1.53.x to 1.71.2
38+
- `google-cloud-pubsub` from 2.15.2 to 2.38.0
39+
- `tink` from 1.9.0 to 1.15.0
40+
- relax `google-cloud-kms`, `grpcio-health-checking`, `grpcio-reflection`, and `grpcio-status` from exact pins to floor constraints
41+
- regenerate all gRPC bindings
3542

3643
### Fixed
3744

osprey_rpc/src/osprey/rpc/actions/v1/action_pb2.py

Lines changed: 53 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4+
import warnings
45

6+
7+
GRPC_GENERATED_VERSION = '1.71.2'
8+
GRPC_VERSION = grpc.__version__
9+
_version_not_supported = False
10+
11+
try:
12+
from grpc._utilities import first_version_is_lower
13+
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
14+
except ImportError:
15+
_version_not_supported = True
16+
17+
if _version_not_supported:
18+
raise RuntimeError(
19+
f'The grpc package installed is at version {GRPC_VERSION},'
20+
+ f' but the generated code in osprey/rpc/actions/v1/action_pb2_grpc.py depends on'
21+
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
22+
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
23+
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
24+
)

osprey_rpc/src/osprey/rpc/actions/v1/action_types_pb2.py

Lines changed: 23 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4+
import warnings
45

6+
7+
GRPC_GENERATED_VERSION = '1.71.2'
8+
GRPC_VERSION = grpc.__version__
9+
_version_not_supported = False
10+
11+
try:
12+
from grpc._utilities import first_version_is_lower
13+
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
14+
except ImportError:
15+
_version_not_supported = True
16+
17+
if _version_not_supported:
18+
raise RuntimeError(
19+
f'The grpc package installed is at version {GRPC_VERSION},'
20+
+ f' but the generated code in osprey/rpc/actions/v1/action_types_pb2_grpc.py depends on'
21+
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
22+
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
23+
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
24+
)

0 commit comments

Comments
 (0)