Skip to content

Commit 35c5a99

Browse files
authored
Bump the protobuf-related dependencies (#308)
2 parents ac7c7a1 + def968d commit 35c5a99

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
jobs:
2626
protolint:
2727
name: Check proto files with protolint
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-24.04
2929

3030
steps:
3131
- name: Fetch sources
@@ -52,7 +52,7 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
os:
55-
- ubuntu-20.04
55+
- ubuntu-24.04
5656
python:
5757
- "3.11"
5858
runs-on: ${{ matrix.os }}
@@ -82,7 +82,7 @@ jobs:
8282

8383
build:
8484
name: Build distribution packages
85-
runs-on: ubuntu-20.04
85+
runs-on: ubuntu-24.04
8686
steps:
8787
- name: Fetch sources
8888
uses: actions/checkout@v3
@@ -104,7 +104,7 @@ jobs:
104104
run: python -m build
105105

106106
- name: Upload distribution files
107-
uses: actions/upload-artifact@v3
107+
uses: actions/upload-artifact@v4
108108
with:
109109
name: dist-packages
110110
path: dist/
@@ -113,7 +113,7 @@ jobs:
113113
test-docs:
114114
name: Test documentation website generation
115115
if: github.event_name != 'push'
116-
runs-on: ubuntu-20.04
116+
runs-on: ubuntu-24.04
117117
steps:
118118
- name: Fetch sources
119119
uses: actions/checkout@v3
@@ -142,7 +142,7 @@ jobs:
142142
mike set-default $MIKE_VERSION
143143
144144
- name: Upload site
145-
uses: actions/upload-artifact@v3
145+
uses: actions/upload-artifact@v4
146146
with:
147147
name: docs-site
148148
path: site/
@@ -152,7 +152,7 @@ jobs:
152152
name: Publish documentation website to GitHub pages
153153
needs: ["nox", "build", "protolint"]
154154
if: github.event_name == 'push'
155-
runs-on: ubuntu-20.04
155+
runs-on: ubuntu-24.04
156156
permissions:
157157
contents: write
158158
steps:
@@ -238,10 +238,10 @@ jobs:
238238
# discussions to create the release announcement in the discussion forums
239239
contents: write
240240
discussions: write
241-
runs-on: ubuntu-20.04
241+
runs-on: ubuntu-24.04
242242
steps:
243243
- name: Download distribution files
244-
uses: actions/download-artifact@v3
244+
uses: actions/download-artifact@v4
245245
with:
246246
name: dist-packages
247247
path: dist
@@ -280,14 +280,14 @@ jobs:
280280
publish-to-pypi:
281281
name: Publish packages to PyPI
282282
needs: ["create-github-release"]
283-
runs-on: ubuntu-20.04
283+
runs-on: ubuntu-24.04
284284
permissions:
285285
# For trusted publishing. See:
286286
# https://blog.pypi.org/posts/2023-04-20-introducing-trusted-publishers/
287287
id-token: write
288288
steps:
289289
- name: Download distribution files
290-
uses: actions/download-artifact@v3
290+
uses: actions/download-artifact@v4
291291
with:
292292
name: dist-packages
293293
path: dist

RELEASE_NOTES.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22

33
## Bug Fixes
44

5-
- Fix a dependency issue by pinning the `grpcio` version and related libraries.
5+
- Bump the `protobuf` minimum supported version to 5.26.1, and the maximum version to 7.0.0
6+
- Bump the `grpcio` and `grpcio-tools` minimum supported versions to 1.63.0
7+
- Bump the `googleapis-common-protos` minimum supported version to 1.63.1

pyproject.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ requires = [
1010
# sure the code is generated using the minimum supported versions, as older
1111
# versions can't work with code that was generated with newer versions.
1212
# https://protobuf.dev/support/cross-version-runtime-guarantee/#backwards
13-
"protobuf == 4.25.3",
14-
"grpcio-tools == 1.51.1",
15-
"grpcio == 1.51.1",
13+
"protobuf == 5.26.1",
14+
"grpcio-tools == 1.63.0",
15+
"grpcio == 1.63.0",
1616
]
1717
build-backend = "setuptools.build_meta"
1818

@@ -34,14 +34,14 @@ classifiers = [
3434
requires-python = ">= 3.11, < 4"
3535
dependencies = [
3636
"frequenz-api-common >= 0.6.2, < 0.7",
37-
"googleapis-common-protos >= 1.56.4, < 2",
37+
"googleapis-common-protos >= 1.63.1, < 2",
3838
# We can't widen beyond 6 because of protobuf cross-version runtime guarantees
3939
# https://protobuf.dev/support/cross-version-runtime-guarantee/#major
40-
"protobuf >= 4.25.3, < 6", # Do not widen beyond 6!
40+
"protobuf >= 5.26.1, < 7", # Do not widen beyond 7!
4141
# We couldn't find any document with a spec about the cross-version runtime
4242
# guarantee for grpcio, so unless we find one in the future, we'll assume
4343
# major version jumps are not compatible
44-
"grpcio >= 1.51.1, < 2", # Do not widen beyond 2!
44+
"grpcio >= 1.63.0, < 2", # Do not widen beyond 2!
4545
]
4646
dynamic = ["version"]
4747

@@ -53,7 +53,7 @@ email = "floss@frequenz.com"
5353
dev-docstrings = [
5454
"pydocstyle == 6.3.0",
5555
"darglint == 1.8.1",
56-
"tomli == 2.0.1", # Needed by pydocstyle to read pyproject.toml
56+
"tomli == 2.0.1", # Needed by pydocstyle to read pyproject.toml
5757
]
5858
dev-formatting = ["black == 23.3.0", "isort == 5.12.0"]
5959
dev-mkdocs = [

0 commit comments

Comments
 (0)