Skip to content

Commit 4c78f1c

Browse files
authored
Merge branch 'unstable/v1' into ww/rm-experimental
2 parents a48a03e + b5a6e8b commit 4c78f1c

File tree

3 files changed

+9
-29
lines changed

3 files changed

+9
-29
lines changed

attestations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from typing import NoReturn
66

77
from pypi_attestations import Attestation, Distribution
8+
from sigstore.models import ClientTrustConfig
89
from sigstore.oidc import IdentityError, IdentityToken, detect_credential
910
from sigstore.sign import Signer, SigningContext
1011

@@ -141,7 +142,7 @@ def main() -> None:
141142
# since permissions can't be to blame at this stage.
142143
die(_TOKEN_RETRIEVAL_FAILED_MESSAGE.format(identity_error=identity_error))
143144

144-
with SigningContext.production().signer(identity, cache=True) as signer:
145+
with SigningContext.from_trust_config(ClientTrustConfig.production()).signer(identity, cache=True) as signer:
145146
debug(f'attesting to dists: {dist_to_attestation_map.keys()}')
146147
for dist_path, attestation_path in dist_to_attestation_map.items():
147148
attest_dist(dist_path, attestation_path, signer)

requirements/runtime.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ id ~= 1.0
1313
requests
1414

1515
# NOTE: Used to generate attestations.
16-
pypi-attestations ~= 0.0.27
17-
sigstore ~= 3.6.5
16+
pypi-attestations ~= 0.0.29
17+
sigstore ~= 4.1
1818

1919
# NOTE: Used to detect the PyPI package name from the distribution files
2020
packaging

requirements/runtime.txt

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#
77
annotated-types==0.7.0
88
# via pydantic
9-
betterproto==2.0.0b6
10-
# via sigstore-protobuf-specs
119
certifi==2025.8.3
1210
# via requests
1311
cffi==1.17.1
@@ -19,22 +17,13 @@ cryptography==45.0.7
1917
# pyopenssl
2018
# pypi-attestations
2119
# rfc3161-client
22-
# secretstorage
2320
# sigstore
2421
dnspython==2.7.0
2522
# via email-validator
2623
docutils==0.22
2724
# via readme-renderer
2825
email-validator==2.3.0
2926
# via pydantic
30-
grpclib==0.4.8
31-
# via betterproto
32-
h2==4.3.0
33-
# via grpclib
34-
hpack==4.1.0
35-
# via h2
36-
hyperframe==6.1.0
37-
# via h2
3827
id==1.5.0
3928
# via
4029
# -r runtime.in
@@ -50,10 +39,6 @@ jaraco-context==6.0.1
5039
# via keyring
5140
jaraco-functools==4.3.0
5241
# via keyring
53-
jeepney==0.9.0
54-
# via
55-
# keyring
56-
# secretstorage
5742
keyring==25.6.0
5843
# via twine
5944
markdown-it-py==4.0.0
@@ -64,8 +49,6 @@ more-itertools==10.8.0
6449
# via
6550
# jaraco-classes
6651
# jaraco-functools
67-
multidict==6.6.4
68-
# via grpclib
6952
nh3==0.3.0
7053
# via readme-renderer
7154
packaging==25.0
@@ -86,6 +69,7 @@ pydantic==2.11.7
8669
# via
8770
# pypi-attestations
8871
# sigstore
72+
# sigstore-models
8973
# sigstore-rekor-types
9074
pydantic-core==2.33.2
9175
# via pydantic
@@ -97,10 +81,8 @@ pyjwt==2.10.1
9781
# via sigstore
9882
pyopenssl==25.1.0
9983
# via sigstore
100-
pypi-attestations==0.0.27
84+
pypi-attestations==0.0.29
10185
# via -r runtime.in
102-
python-dateutil==2.9.0.post0
103-
# via betterproto
10486
readme-renderer==44.0
10587
# via twine
10688
requests==2.32.5
@@ -125,22 +107,18 @@ rich==14.1.0
125107
# via
126108
# sigstore
127109
# twine
128-
secretstorage==3.3.3
129-
# via keyring
130110
securesystemslib==1.3.0
131111
# via tuf
132-
sigstore==3.6.5
112+
sigstore==4.1.0
133113
# via
134114
# -r runtime.in
135115
# pypi-attestations
136-
sigstore-protobuf-specs==0.3.2
116+
sigstore-models==0.0.5
137117
# via
138118
# pypi-attestations
139119
# sigstore
140120
sigstore-rekor-types==0.0.18
141121
# via sigstore
142-
six==1.17.0
143-
# via python-dateutil
144122
tuf==6.0.0
145123
# via sigstore
146124
twine==6.1.0
@@ -149,6 +127,7 @@ typing-extensions==4.15.0
149127
# via
150128
# pydantic
151129
# pydantic-core
130+
# sigstore-models
152131
# typing-inspection
153132
typing-inspection==0.4.1
154133
# via pydantic

0 commit comments

Comments
 (0)