Skip to content

Commit c389616

Browse files
clement-tourriereKevin Westphal
authored andcommitted
fix(deps): make uv install resolve without prereleases
Upgrade the sigstore requirement to v4 so ggshield no longer pulls sigstore 3's sigstore-protobuf-specs dependency, which requires pre-release betterproto versions that uv rejects by default. Update the PyInstaller bundle smoke-check paths for sigstore 4 package data.
1 parent 093a0ff commit c389616

4 files changed

Lines changed: 90 additions & 131 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### Fixed
2+
3+
- Fixed `uv tool install ggshield` resolution by requiring sigstore 4, avoiding sigstore 3's transitive pre-release dependency on `betterproto`.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies = [
4545
"pyyaml~=6.0.1",
4646
"requests~=2.32.0",
4747
"rich~=13.0",
48-
"sigstore>=3.0.0,<4",
48+
"sigstore>=4.0.0,<5",
4949
"typing-extensions~=4.14",
5050
"urllib3>=2.2.2,<3",
5151
"truststore>=0.10.1; python_version >= \"3.10\"",

scripts/build-os-packages/build-os-packages

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,12 @@ argument in step_build and re-run."
269269

270270
# Layer 2: structural assertions for known package-data files. Each
271271
# entry below was added because we caught (or want to prevent) a
272-
# silent-drop bug. Append, don't replace.
272+
# silent-drop bug. Keep paths in sync with dependency package-data layouts.
273273
local required_paths=(
274-
# sigstore TUF bootstrap roots — missing these breaks Verifier.production()
275-
"_internal/sigstore/_store/prod/root.json"
276-
"_internal/sigstore/_store/prod/trusted_root.json"
274+
# sigstore TUF bootstrap roots/config — missing these breaks Verifier.production()
275+
"_internal/sigstore/_store/https%3A%2F%2Ftuf-repo-cdn.sigstore.dev/root.json"
276+
"_internal/sigstore/_store/https%3A%2F%2Ftuf-repo-cdn.sigstore.dev/trusted_root.json"
277+
"_internal/sigstore/_store/https%3A%2F%2Ftuf-repo-cdn.sigstore.dev/signing_config.v0.2.json"
277278
)
278279
local rel
279280
for rel in "${required_paths[@]}" ; do

uv.lock

Lines changed: 81 additions & 126 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)