This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new 4619a59 Use type keywords where appropriate
4619a59 is described below
commit 4619a5934c85a9313e0eea0ceedf469c9fbcebb0
Author: Sean B. Palmer <[email protected]>
AuthorDate: Fri Oct 17 15:23:56 2025 +0100
Use type keywords where appropriate
---
atr/blueprints/api/api.py | 2 +-
atr/models/api.py | 4 ++--
atr/routes/finish.py | 2 +-
atr/sbom/models/conformance.py | 2 +-
atr/sbom/models/maven.py | 2 +-
atr/sbom/models/patch.py | 4 ++--
atr/tarzip.py | 8 ++++----
atr/tasks/checks/license.py | 2 +-
atr/validate.py | 18 +++++++++---------
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/atr/blueprints/api/api.py b/atr/blueprints/api/api.py
index e672c70..83f3689 100644
--- a/atr/blueprints/api/api.py
+++ b/atr/blueprints/api/api.py
@@ -50,7 +50,7 @@ import atr.util as util
# We implicitly have /api/openapi.json
-DictResponse = tuple[dict[str, Any], int]
+type DictResponse = tuple[dict[str, Any], int]
@api.BLUEPRINT.route("/checks/list/<project>/<version>")
diff --git a/atr/models/api.py b/atr/models/api.py
index 049225c..20e364c 100644
--- a/atr/models/api.py
+++ b/atr/models/api.py
@@ -191,7 +191,7 @@ class KeysUploadResult(schema.Strict):
key: sql.PublicSigningKey
-KeysUploadOutcome = Annotated[
+type KeysUploadOutcome = Annotated[
KeysUploadResult | KeysUploadException,
schema.Field(discriminator="status"),
]
@@ -520,7 +520,7 @@ class VoteTabulateResults(schema.Strict):
# This is for *Results classes only
# We do NOT put *Args classes here
-Results = Annotated[
+type Results = Annotated[
ChecksListResults
| ChecksOngoingResults
| CommitteeGetResults
diff --git a/atr/routes/finish.py b/atr/routes/finish.py
index e84dc58..295ad9a 100644
--- a/atr/routes/finish.py
+++ b/atr/routes/finish.py
@@ -41,7 +41,7 @@ import atr.storage as storage
import atr.template as template
import atr.util as util
-Respond = Callable[[int, str], Awaitable[tuple[quart_response.Response, int] |
response.Response]]
+type Respond = Callable[[int, str], Awaitable[tuple[quart_response.Response,
int] | response.Response]]
class DeleteEmptyDirectoryForm(forms.Typed):
diff --git a/atr/sbom/models/conformance.py b/atr/sbom/models/conformance.py
index 953765c..95faaa1 100644
--- a/atr/sbom/models/conformance.py
+++ b/atr/sbom/models/conformance.py
@@ -70,7 +70,7 @@ class MissingComponentProperty(Strict):
return value if isinstance(value, ComponentProperty) else
ComponentProperty(value)
-Missing = Annotated[
+type Missing = Annotated[
MissingProperty | MissingComponentProperty,
pydantic.Field(discriminator="kind"),
]
diff --git a/atr/sbom/models/maven.py b/atr/sbom/models/maven.py
index b7a75bd..8f87551 100644
--- a/atr/sbom/models/maven.py
+++ b/atr/sbom/models/maven.py
@@ -44,7 +44,7 @@ class OutdatedMissingVersion(Strict):
name: str
-Outdated = Annotated[
+type Outdated = Annotated[
OutdatedTool | OutdatedMissingMetadata | OutdatedMissingTimestamp |
OutdatedMissingVersion,
pydantic.Field(discriminator="kind"),
]
diff --git a/atr/sbom/models/patch.py b/atr/sbom/models/patch.py
index c2dd5f2..add8c9d 100644
--- a/atr/sbom/models/patch.py
+++ b/atr/sbom/models/patch.py
@@ -59,5 +59,5 @@ class TestOp(Strict):
value: Any
-PatchOp = AddOp | RemoveOp | ReplaceOp | MoveOp | CopyOp | TestOp
-Patch = list[PatchOp]
+type PatchOp = AddOp | RemoveOp | ReplaceOp | MoveOp | CopyOp | TestOp
+type Patch = list[PatchOp]
diff --git a/atr/tarzip.py b/atr/tarzip.py
index 13f6cd8..ae15e3e 100644
--- a/atr/tarzip.py
+++ b/atr/tarzip.py
@@ -91,7 +91,7 @@ class ZipMember(AbstractArchiveMember[zipfile.ZipInfo]):
return False
-Member = TarMember | ZipMember
+type Member = TarMember | ZipMember
class ArchiveContext[ArchiveT: (tarfile.TarFile, zipfile.ZipFile)]:
@@ -129,9 +129,9 @@ class ArchiveContext[ArchiveT: (tarfile.TarFile,
zipfile.ZipFile)]:
return self._archive_obj
-TarArchive = ArchiveContext[tarfile.TarFile]
-ZipArchive = ArchiveContext[zipfile.ZipFile]
-Archive = TarArchive | ZipArchive
+type TarArchive = ArchiveContext[tarfile.TarFile]
+type ZipArchive = ArchiveContext[zipfile.ZipFile]
+type Archive = TarArchive | ZipArchive
@contextlib.contextmanager
diff --git a/atr/tasks/checks/license.py b/atr/tasks/checks/license.py
index 9d82af5..85a90c5 100644
--- a/atr/tasks/checks/license.py
+++ b/atr/tasks/checks/license.py
@@ -117,7 +117,7 @@ class MemberSkippedResult(schema.Strict):
reason: str
-Result = ArtifactResult | MemberResult | MemberSkippedResult
+type Result = ArtifactResult | MemberResult | MemberSkippedResult
# Tasks
diff --git a/atr/validate.py b/atr/validate.py
index 0d29952..a230109 100644
--- a/atr/validate.py
+++ b/atr/validate.py
@@ -38,15 +38,15 @@ class AnnotatedDivergence(NamedTuple):
divergence: Divergence
-Divergences = Generator[Divergence]
-AnnotatedDivergences = Generator[AnnotatedDivergence]
-AsyncAnnotatedDivergences = AsyncGenerator[AnnotatedDivergence]
-CommitteeDivergences = Callable[[sql.Committee], Divergences]
-CommitteeAnnotatedDivergences = Callable[[sql.Committee], AnnotatedDivergences]
-ProjectDivergences = Callable[[sql.Project], Divergences]
-ProjectAnnotatedDivergences = Callable[[sql.Project], AnnotatedDivergences]
-ReleaseDivergences = Callable[[sql.Release], Divergences]
-ReleaseAnnotatedDivergences = Callable[[sql.Release], AnnotatedDivergences]
+type Divergences = Generator[Divergence]
+type AnnotatedDivergences = Generator[AnnotatedDivergence]
+type AsyncAnnotatedDivergences = AsyncGenerator[AnnotatedDivergence]
+type CommitteeDivergences = Callable[[sql.Committee], Divergences]
+type CommitteeAnnotatedDivergences = Callable[[sql.Committee],
AnnotatedDivergences]
+type ProjectDivergences = Callable[[sql.Project], Divergences]
+type ProjectAnnotatedDivergences = Callable[[sql.Project],
AnnotatedDivergences]
+type ReleaseDivergences = Callable[[sql.Release], Divergences]
+type ReleaseAnnotatedDivergences = Callable[[sql.Release],
AnnotatedDivergences]
T = TypeVar("T")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
