Skip to content

Commit 4bac257

Browse files
Switch uv resolution back to default (#427)
This switches our version resolution back to the default of "highest", but leaves around our testing of our entire version range in CI. This more closely follows [the recommendation of the uv team][1] for libraries. This should help with resolving some of the GitHub security alerts we get on this repository. [1]: https://docs.astral.sh/uv/concepts/resolution/#resolution-strategy Ref: connectrpc/connect-python#142 Ref: #373 Ref: astral-sh/uv#18178 (comment)
1 parent 8781f58 commit 4bac257

3 files changed

Lines changed: 304 additions & 372 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
- run: make install
3636
- run: make lint
3737
- run: make format
38-
# When running with matrix.resolution == highest, we expect uv.lock to change, but we don't want that file checked in.
39-
- if: matrix.resolution == 'lowest-direct'
38+
# When running with matrix.resolution == lowest-direct, we expect uv.lock to change, but we don't want that file checked in.
39+
- if: matrix.resolution == 'highest'
4040
run: make checkgenerate
4141
env:
4242
BUF_TOKEN: ${{ secrets.BUF_TOKEN }}

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ classifiers = [
2222
]
2323
dynamic = ["version"]
2424
dependencies = [
25+
# We need at least this version, which fixed Python 3.14 compatibility (tp_new metaclass issue).
26+
# The fix was never backported to the 5.x series.
27+
# Ref: https://github.com/protocolbuffers/protobuf/pull/20594
28+
"protobuf>=6.31.0; python_version >= '3.14'",
2529
"protobuf>=5",
2630
"cel-python>=0.5",
2731
# We need at least this version, which started publishing wheels for Python 3.14.
@@ -49,9 +53,6 @@ dev = [
4953
"types-protobuf>=5.29.1.20250315",
5054
]
5155

52-
[tool.uv]
53-
resolution = "lowest-direct"
54-
5556
[tool.hatch.version]
5657
source = "vcs"
5758
raw-options = { fallback_version = "0.0.0" }

0 commit comments

Comments
 (0)