Annotation tweaks: Keep mypy happy

The existing annotations probably should work... but currently they
make mypy unhappy.

Signed-off-by: Jussi Kukkonen <[email protected]>

Author: jku

sigstore/_internal/trust.py

@@ -93,14 +93,14 @@ class Key:
     key: PublicKey
     key_id: KeyID
 
-    _RSA_SHA_256_DETAILS: ClassVar[set[_PublicKeyDetails]] = {
+    _RSA_SHA_256_DETAILS: ClassVar = {
         _PublicKeyDetails.PKCS1_RSA_PKCS1V5,
         _PublicKeyDetails.PKIX_RSA_PKCS1V15_2048_SHA256,
         _PublicKeyDetails.PKIX_RSA_PKCS1V15_3072_SHA256,
         _PublicKeyDetails.PKIX_RSA_PKCS1V15_4096_SHA256,
     }
 
-    _EC_DETAILS_TO_HASH: ClassVar[dict[_PublicKeyDetails, hashes.HashAlgorithm]] = {
+    _EC_DETAILS_TO_HASH: ClassVar = {
         _PublicKeyDetails.PKIX_ECDSA_P256_SHA_256: hashes.SHA256(),
         _PublicKeyDetails.PKIX_ECDSA_P384_SHA_384: hashes.SHA384(),
         _PublicKeyDetails.PKIX_ECDSA_P521_SHA_512: hashes.SHA512(),

sigstore/models.py

@@ -667,9 +667,10 @@ def _from_parts(
 
         # Fill in the appropriate variants.
         if isinstance(content, common_v1.MessageSignature):
-            content = {"message_signature": content}
+            # mypy will be mystified if types are specified here
+            content_dict: dict[str, Any] = {"message_signature": content}
         else:
-            content = {"dsse_envelope": content._inner}
+            content_dict = {"dsse_envelope": content._inner}
 
         inner = _Bundle(
             media_type=Bundle.BundleType.BUNDLE_0_3.value,
@@ -678,7 +679,7 @@ def _from_parts(
                 tlog_entries=[log_entry._to_rekor()],
                 timestamp_verification_data=timestamp_verifcation_data,
             ),
-            **content,
+            **content_dict,
         )
 
         return cls(inner)