This is an automated email from the ASF dual-hosted git repository.
arm pushed a commit to branch arm
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/arm by this push:
new bf391606 #992 - Fix safe types on ignore form
bf391606 is described below
commit bf39160630161f5cd6bd58f3fe24af2a50b92c10
Author: Alastair McFarlane <[email protected]>
AuthorDate: Wed Apr 1 15:10:12 2026 +0100
#992 - Fix safe types on ignore form
---
atr/shared/ignores.py | 2 +-
atr/shared/projects.py | 4 ++--
atr/storage/writers/checks.py | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/atr/shared/ignores.py b/atr/shared/ignores.py
index 947c86eb..a6e06c1e 100644
--- a/atr/shared/ignores.py
+++ b/atr/shared/ignores.py
@@ -88,7 +88,7 @@ class UpdateIgnoreForm(form.Form):
variant: UPDATE = form.value(UPDATE)
id: int = form.label("ID", widget=form.Widget.HIDDEN)
release_glob: str = form.label("Release pattern", default="")
- revision_number: str = form.label("Revision number (literal)", default="")
+ revision_number: safe.OptionalRevisionNumber = form.label("Revision number
(literal)", default="")
checker_glob: str = form.label("Checker pattern", default="")
primary_rel_path_glob: str = form.label("Primary rel path pattern",
default="")
member_rel_path_glob: str = form.label("Member rel path pattern",
default="")
diff --git a/atr/shared/projects.py b/atr/shared/projects.py
index 03e4ec2d..92c3974b 100644
--- a/atr/shared/projects.py
+++ b/atr/shared/projects.py
@@ -39,7 +39,7 @@ type DELETE_PROJECT = Literal["delete_project"]
class AddProjectForm(form.Form):
- committee_key: str = form.label("Committee name",
widget=form.Widget.HIDDEN)
+ committee_key: safe.CommitteeKey = form.label("Committee name",
widget=form.Widget.HIDDEN)
display_name: str = form.label(
"Display name",
'For example, "Apache Example" or "Apache Example Components". '
@@ -53,7 +53,7 @@ class AddProjectForm(form.Form):
@pydantic.model_validator(mode="after")
def validate_fields(self) -> AddProjectForm:
- committee_key = self.committee_key
+ committee_key = str(self.committee_key)
display_name = self.display_name.strip()
label = self.label.strip()
diff --git a/atr/storage/writers/checks.py b/atr/storage/writers/checks.py
index 3674f97f..09c8d456 100644
--- a/atr/storage/writers/checks.py
+++ b/atr/storage/writers/checks.py
@@ -115,7 +115,7 @@ class CommitteeMember(CommitteeParticipant):
created=datetime.datetime.now(datetime.UTC),
project_key=str(project_key),
release_glob=release_glob,
- revision_number=str(revision_number),
+ revision_number=str(revision_number) if revision_number is not
None else None,
checker_glob=checker_glob,
primary_rel_path_glob=primary_rel_path_glob,
member_rel_path_glob=member_rel_path_glob,
@@ -146,7 +146,7 @@ class CommitteeMember(CommitteeParticipant):
self,
id: int,
release_glob: str | None = None,
- revision_number: str | None = None,
+ revision_number: safe.RevisionNumber | None = None,
checker_glob: str | None = None,
primary_rel_path_glob: str | None = None,
member_rel_path_glob: str | None = None,
@@ -167,7 +167,7 @@ class CommitteeMember(CommitteeParticipant):
# The updating ASF UID is now responsible for the whole ignore
cri.asf_uid = self.__asf_uid
cri.release_glob = release_glob
- cri.revision_number = revision_number
+ cri.revision_number = str(revision_number) if revision_number is not
None else None
cri.checker_glob = checker_glob
cri.primary_rel_path_glob = primary_rel_path_glob
cri.member_rel_path_glob = member_rel_path_glob
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
