You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by sb...@apache.org on 2025/04/15 13:33:01 UTC
(tooling-trusted-release) branch main updated: Fix function order in several route modules
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-release.git
The following commit(s) were added to refs/heads/main by this push:
new 3fa5537 Fix function order in several route modules
3fa5537 is described below
commit 3fa55379fab7e4e961283d78a825f5473968fb56
Author: Sean B. Palmer <se...@miscoranda.com>
AuthorDate: Tue Apr 15 14:32:41 2025 +0100
Fix function order in several route modules
---
atr/routes/draft.py | 62 +++++-----
atr/routes/keys.py | 276 ++++++++++++++++++++++-----------------------
atr/routes/projects.py | 196 ++++++++++++++++----------------
atr/routes/release.py | 42 +++----
scripts/interface_order.py | 6 +-
5 files changed, 291 insertions(+), 291 deletions(-)
diff --git a/atr/routes/draft.py b/atr/routes/draft.py
index 6fd9a38..a56e150 100644
--- a/atr/routes/draft.py
+++ b/atr/routes/draft.py
@@ -110,14 +110,6 @@ class PromoteForm(util.QuartFormTyped):
submit = wtforms.SubmitField("Promote candidate draft")
-async def _number_of_release_files(release: models.Release) -> int:
- """Return the number of files in the release."""
- path_project = release.project.name
- path_version = release.version
- path = util.get_release_candidate_draft_dir() / path_project / path_version / "latest"
- return len(await util.paths_recursive(path))
-
-
@routes.committer("/draft/add", methods=["GET", "POST"])
async def add(session: routes.CommitterSession) -> response.Response | str:
"""Show a page to allow the user to rsync files to candidate drafts."""
@@ -915,23 +907,6 @@ async def view_path(
)
-async def _delete_candidate_draft(data: db.Session, candidate_draft_name: str) -> None:
- """Delete a candidate draft and all its associated files."""
- # Check that the release exists
- release = await data.release(name=candidate_draft_name, _project=True, _packages=True).get()
- if not release:
- raise routes.FlashError("Candidate draft not found")
- if release.phase != models.ReleasePhase.RELEASE_CANDIDATE_DRAFT:
- raise routes.FlashError("Candidate draft is not in the release candidate draft phase")
-
- # Delete all associated packages first
- for package in release.packages:
- await data.delete(package)
-
- # Delete the release record
- await data.delete(release)
-
-
async def _add(session: routes.CommitterSession, form: AddProtocol) -> None:
"""Handle POST request for creating a new release candidate draft."""
version = str(form.version_name.data)
@@ -973,6 +948,31 @@ async def _add(session: routes.CommitterSession, form: AddProtocol) -> None:
data.add(release)
+async def _delete_candidate_draft(data: db.Session, candidate_draft_name: str) -> None:
+ """Delete a candidate draft and all its associated files."""
+ # Check that the release exists
+ release = await data.release(name=candidate_draft_name, _project=True, _packages=True).get()
+ if not release:
+ raise routes.FlashError("Candidate draft not found")
+ if release.phase != models.ReleasePhase.RELEASE_CANDIDATE_DRAFT:
+ raise routes.FlashError("Candidate draft is not in the release candidate draft phase")
+
+ # Delete all associated packages first
+ for package in release.packages:
+ await data.delete(package)
+
+ # Delete the release record
+ await data.delete(release)
+
+
+async def _number_of_release_files(release: models.Release) -> int:
+ """Return the number of files in the release."""
+ path_project = release.project.name
+ path_version = release.version
+ path = util.get_release_candidate_draft_dir() / path_project / path_version / "latest"
+ return len(await util.paths_recursive(path))
+
+
async def _promote(
data: db.Session,
candidate_draft_name: str,
@@ -1098,6 +1098,12 @@ async def _revisions_process(
return revision_data, current_revision_files
+async def _save_file(file: datastructures.FileStorage, target_path: pathlib.Path) -> None:
+ async with aiofiles.open(target_path, "wb") as f:
+ while chunk := await asyncio.to_thread(file.stream.read, 8192):
+ await f.write(chunk)
+
+
async def _upload_files(
project_name: str,
version_name: str,
@@ -1136,9 +1142,3 @@ async def _upload_files(
await _save_file(file, target_path)
return len(files)
-
-
-async def _save_file(file: datastructures.FileStorage, target_path: pathlib.Path) -> None:
- async with aiofiles.open(target_path, "wb") as f:
- while chunk := await asyncio.to_thread(file.stream.read, 8192):
- await f.write(chunk)
diff --git a/atr/routes/keys.py b/atr/routes/keys.py
index 6c4156a..64a5943 100644
--- a/atr/routes/keys.py
+++ b/atr/routes/keys.py
@@ -52,6 +52,102 @@ class AddSSHKeyForm(util.QuartFormTyped):
submit = wtforms.SubmitField("Add SSH key")
+@routes.committer("/keys/add", methods=["GET", "POST"])
+async def add(session: routes.CommitterSession) -> str:
+ """Add a new public signing key to the user's account."""
+ key_info = None
+
+ # Get committees for all projects the user is a member of
+ async with db.session() as data:
+ project_list = session.committees + session.projects
+ user_committees = await data.committee(name_in=project_list).all()
+
+ committee_choices = [(c.name, c.display_name or c.name) for c in user_committees]
+
+ class AddGpgKeyForm(util.QuartFormTyped):
+ public_key = wtforms.TextAreaField(
+ "Public GPG key", validators=[wtforms.validators.InputRequired("Public key is required")]
+ )
+ selected_committees = wtforms.SelectMultipleField(
+ "Associate key with committees",
+ validators=[wtforms.validators.InputRequired("You must select at least one committee")],
+ coerce=str,
+ choices=committee_choices,
+ option_widget=widgets.CheckboxInput(),
+ widget=widgets.ListWidget(prefix_label=False),
+ )
+ submit = wtforms.SubmitField("Add GPG key")
+
+ form = await AddGpgKeyForm.create_form(data=await quart.request.form if quart.request.method == "POST" else None)
+
+ if await form.validate_on_submit():
+ try:
+ public_key_data: str = util.unwrap(form.public_key.data)
+ selected_committees_data: list[str] = util.unwrap(form.selected_committees.data)
+
+ invalid_committees = [
+ committee
+ for committee in selected_committees_data
+ if (committee not in session.committees) and (committee not in session.projects)
+ ]
+ if invalid_committees:
+ raise routes.FlashError(f"Invalid PMC selection: {', '.join(invalid_committees)}")
+
+ key_info = await key_user_add(session.uid, public_key_data, selected_committees_data)
+ if key_info:
+ await quart.flash(f"GPG key {key_info.get('fingerprint', '')} added successfully.", "success")
+ # Clear form data on success by creating a new empty form instance
+ form = await AddGpgKeyForm.create_form()
+
+ except routes.FlashError as e:
+ logging.warning("FlashError adding GPG key: %s", e)
+ await quart.flash(str(e), "error")
+ except Exception as e:
+ logging.exception("Exception adding GPG key:")
+ await quart.flash(f"An unexpected error occurred: {e!s}", "error")
+
+ return await quart.render_template(
+ "keys-add.html",
+ asf_id=session.uid,
+ user_committees=user_committees,
+ form=form,
+ key_info=key_info,
+ algorithms=routes.algorithms,
+ )
+
+
+@routes.committer("/keys/delete", methods=["POST"])
+async def delete(session: routes.CommitterSession) -> response.Response:
+ """Delete a public signing key or SSH key from the user's account."""
+ form = await DeleteKeyForm.create_form(data=await quart.request.form)
+
+ if not await form.validate_on_submit():
+ return await session.redirect(keys, error="Invalid request for key deletion.")
+
+ fingerprint = (await quart.request.form).get("fingerprint")
+ if not fingerprint:
+ return await session.redirect(keys, error="Missing key fingerprint for deletion.")
+
+ async with db.session() as data:
+ async with data.begin():
+ # Try to get a GPG key first
+ key = await data.public_signing_key(fingerprint=fingerprint, apache_uid=session.uid).get()
+ if key:
+ # Delete the GPG key
+ await data.delete(key)
+ return await session.redirect(keys, success="GPG key deleted successfully")
+
+ # If not a GPG key, try to get an SSH key
+ ssh_key = await data.ssh_key(fingerprint=fingerprint, asf_uid=session.uid).get()
+ if ssh_key:
+ # Delete the SSH key
+ await data.delete(ssh_key)
+ return await session.redirect(keys, success="SSH key deleted successfully")
+
+ # No key was found
+ return await session.redirect(keys, error="Key not found or not owned by you")
+
+
@contextlib.asynccontextmanager
async def ephemeral_gpg_home() -> AsyncGenerator[str]:
"""Create a temporary directory for an isolated GPG home, and clean it up on exit."""
@@ -108,48 +204,6 @@ def key_ssh_fingerprint(ssh_key_string: str) -> str:
raise ValueError("Invalid SSH key format")
-async def _key_user_add_validate_key_properties(public_key: str) -> tuple[dict, str]:
- """Validate GPG key string, import it, and return its properties and fingerprint."""
- async with ephemeral_gpg_home() as gpg_home:
- gpg = gnupg.GPG(gnupghome=gpg_home)
- import_result = await asyncio.to_thread(gpg.import_keys, public_key)
-
- if not import_result.fingerprints:
- raise routes.FlashError("Invalid public key format or failed import")
-
- fingerprint = import_result.fingerprints[0]
- if fingerprint is None:
- # Should be unreachable given the previous check, but satisfy type checker
- raise routes.FlashError("Failed to get fingerprint after import")
- fingerprint_lower = fingerprint.lower()
-
- # List keys to get details
- keys = await asyncio.to_thread(gpg.list_keys)
-
- # Find the specific key details from the list using the fingerprint
- key_details = None
- for k in keys:
- if k.get("fingerprint") is not None and k["fingerprint"].lower() == fingerprint_lower:
- key_details = k
- break
-
- if not key_details:
- # This might indicate an issue with gpg.list_keys or the environment
- logging.error(
- f"Could not find key details for fingerprint {fingerprint_lower}"
- f" after successful import. Keys listed: {keys}"
- )
- raise routes.FlashError("Failed to retrieve key details after import")
-
- # Validate key algorithm and length
- # https://infra.apache.org/release-signing.html#note
- # Says that keys must be at least 2048 bits
- if (key_details.get("algo") == "1") and (int(key_details.get("length", "0")) < 2048):
- raise routes.FlashError("RSA Key is not long enough; must be at least 2048 bits")
-
- return key_details, fingerprint_lower
-
-
async def key_user_add(asf_uid: str | None, public_key: str, selected_committees: list[str]) -> dict | None:
if not public_key:
raise routes.FlashError("Public key is required")
@@ -239,102 +293,6 @@ async def key_user_session_add(
}
-@routes.committer("/keys/add", methods=["GET", "POST"])
-async def add(session: routes.CommitterSession) -> str:
- """Add a new public signing key to the user's account."""
- key_info = None
-
- # Get committees for all projects the user is a member of
- async with db.session() as data:
- project_list = session.committees + session.projects
- user_committees = await data.committee(name_in=project_list).all()
-
- committee_choices = [(c.name, c.display_name or c.name) for c in user_committees]
-
- class AddGpgKeyForm(util.QuartFormTyped):
- public_key = wtforms.TextAreaField(
- "Public GPG key", validators=[wtforms.validators.InputRequired("Public key is required")]
- )
- selected_committees = wtforms.SelectMultipleField(
- "Associate key with committees",
- validators=[wtforms.validators.InputRequired("You must select at least one committee")],
- coerce=str,
- choices=committee_choices,
- option_widget=widgets.CheckboxInput(),
- widget=widgets.ListWidget(prefix_label=False),
- )
- submit = wtforms.SubmitField("Add GPG key")
-
- form = await AddGpgKeyForm.create_form(data=await quart.request.form if quart.request.method == "POST" else None)
-
- if await form.validate_on_submit():
- try:
- public_key_data: str = util.unwrap(form.public_key.data)
- selected_committees_data: list[str] = util.unwrap(form.selected_committees.data)
-
- invalid_committees = [
- committee
- for committee in selected_committees_data
- if (committee not in session.committees) and (committee not in session.projects)
- ]
- if invalid_committees:
- raise routes.FlashError(f"Invalid PMC selection: {', '.join(invalid_committees)}")
-
- key_info = await key_user_add(session.uid, public_key_data, selected_committees_data)
- if key_info:
- await quart.flash(f"GPG key {key_info.get('fingerprint', '')} added successfully.", "success")
- # Clear form data on success by creating a new empty form instance
- form = await AddGpgKeyForm.create_form()
-
- except routes.FlashError as e:
- logging.warning("FlashError adding GPG key: %s", e)
- await quart.flash(str(e), "error")
- except Exception as e:
- logging.exception("Exception adding GPG key:")
- await quart.flash(f"An unexpected error occurred: {e!s}", "error")
-
- return await quart.render_template(
- "keys-add.html",
- asf_id=session.uid,
- user_committees=user_committees,
- form=form,
- key_info=key_info,
- algorithms=routes.algorithms,
- )
-
-
-@routes.committer("/keys/delete", methods=["POST"])
-async def delete(session: routes.CommitterSession) -> response.Response:
- """Delete a public signing key or SSH key from the user's account."""
- form = await DeleteKeyForm.create_form(data=await quart.request.form)
-
- if not await form.validate_on_submit():
- return await session.redirect(keys, error="Invalid request for key deletion.")
-
- fingerprint = (await quart.request.form).get("fingerprint")
- if not fingerprint:
- return await session.redirect(keys, error="Missing key fingerprint for deletion.")
-
- async with db.session() as data:
- async with data.begin():
- # Try to get a GPG key first
- key = await data.public_signing_key(fingerprint=fingerprint, apache_uid=session.uid).get()
- if key:
- # Delete the GPG key
- await data.delete(key)
- return await session.redirect(keys, success="GPG key deleted successfully")
-
- # If not a GPG key, try to get an SSH key
- ssh_key = await data.ssh_key(fingerprint=fingerprint, asf_uid=session.uid).get()
- if ssh_key:
- # Delete the SSH key
- await data.delete(ssh_key)
- return await session.redirect(keys, success="SSH key deleted successfully")
-
- # No key was found
- return await session.redirect(keys, error="Key not found or not owned by you")
-
-
@routes.committer("/keys")
async def keys(session: routes.CommitterSession) -> str:
"""View all keys associated with the user's account."""
@@ -450,6 +408,48 @@ async def upload(session: routes.CommitterSession) -> str:
return await render()
+async def _key_user_add_validate_key_properties(public_key: str) -> tuple[dict, str]:
+ """Validate GPG key string, import it, and return its properties and fingerprint."""
+ async with ephemeral_gpg_home() as gpg_home:
+ gpg = gnupg.GPG(gnupghome=gpg_home)
+ import_result = await asyncio.to_thread(gpg.import_keys, public_key)
+
+ if not import_result.fingerprints:
+ raise routes.FlashError("Invalid public key format or failed import")
+
+ fingerprint = import_result.fingerprints[0]
+ if fingerprint is None:
+ # Should be unreachable given the previous check, but satisfy type checker
+ raise routes.FlashError("Failed to get fingerprint after import")
+ fingerprint_lower = fingerprint.lower()
+
+ # List keys to get details
+ keys = await asyncio.to_thread(gpg.list_keys)
+
+ # Find the specific key details from the list using the fingerprint
+ key_details = None
+ for k in keys:
+ if k.get("fingerprint") is not None and k["fingerprint"].lower() == fingerprint_lower:
+ key_details = k
+ break
+
+ if not key_details:
+ # This might indicate an issue with gpg.list_keys or the environment
+ logging.error(
+ f"Could not find key details for fingerprint {fingerprint_lower}"
+ f" after successful import. Keys listed: {keys}"
+ )
+ raise routes.FlashError("Failed to retrieve key details after import")
+
+ # Validate key algorithm and length
+ # https://infra.apache.org/release-signing.html#note
+ # Says that keys must be at least 2048 bits
+ if (key_details.get("algo") == "1") and (int(key_details.get("length", "0")) < 2048):
+ raise routes.FlashError("RSA Key is not long enough; must be at least 2048 bits")
+
+ return key_details, fingerprint_lower
+
+
async def _upload_key_blocks(key_file: datastructures.FileStorage) -> list[str]:
"""Extract GPG key blocks from a KEYS file."""
# Read the file content
diff --git a/atr/routes/projects.py b/atr/routes/projects.py
index e5e9cc5..7f2953d 100644
--- a/atr/routes/projects.py
+++ b/atr/routes/projects.py
@@ -40,6 +40,39 @@ class AddFormProtocol(Protocol):
submit: wtforms.SubmitField
+class VotePolicyForm(util.QuartFormTyped):
+ """
+ A Form to create/edit a VotePolicy.
+
+ TODO: Currently only a single mailto_address is supported.
+ see: https://stackoverflow.com/questions/49066046/append-entry-to-fieldlist-with-flask-wtforms-using-ajax
+ """
+
+ project_name = wtforms.HiddenField("project_name")
+ mailto_addresses = wtforms.FieldList(
+ wtforms.StringField(
+ "Email",
+ validators=[
+ wtforms.validators.InputRequired("Please provide a valid email address"),
+ wtforms.validators.Email(),
+ ],
+ ),
+ min_entries=1,
+ )
+ min_hours = wtforms.IntegerField(
+ "Minimum Voting Period:",
+ validators=[
+ wtforms.validators.NumberRange(min=0, max=144, message="Voting period must be between 0h and 144h")
+ ],
+ default=72,
+ )
+ manual_vote = wtforms.BooleanField("Voting Process:")
+ release_checklist = wtforms.StringField("Release Checklist:", widget=wtforms.widgets.TextArea())
+ pause_for_rm = wtforms.BooleanField("Pause for RM:")
+
+ submit = wtforms.SubmitField("Save")
+
+
@routes.committer("/project/add", methods=["GET", "POST"])
async def add(session: routes.CommitterSession) -> response.Response | str:
def long_name(project: models.Project) -> str:
@@ -68,71 +101,6 @@ async def add(session: routes.CommitterSession) -> response.Response | str:
return await quart.render_template("project-add.html", form=form)
-async def _add_project(form: AddFormProtocol, asf_id: str) -> response.Response:
- base_project_name = str(form.project_name.data)
- derived_project_name = str(form.derived_project_name.data).strip()
-
- def _generate_label(text: str) -> str:
- # TODO: We should probably add long name validation
- text = text.lower()
- text = re.sub(r" +", "-", text)
- text = re.sub(r"[^a-z0-9-]", "", text)
- return text
-
- async with db.session() as data:
- # Get the base project to derive from
- base_project = await data.project(name=base_project_name).get()
- if not base_project:
- # This should not happen, assuming that the dropdown is populated correctly
- raise routes.FlashError(f"Base project {base_project_name} not found")
-
- # Construct the new label
- derived_label = _generate_label(derived_project_name)
- if not derived_label:
- raise routes.FlashError("Derived project name must contain valid characters for label generation")
- new_project_label = f"{base_project.name}-{derived_label}"
-
- # Construct the new full name
- # We ensure that parenthesised suffixes like "(Incubating)" are preserved
- base_name = base_project.full_name or base_project.name
- match = re.match(r"^(.*?) *(\(.*\))?$", base_name)
- if match:
- main_part = match.group(1).strip()
- suffix_part = match.group(2)
- else:
- main_part = base_name.strip()
- suffix_part = None
-
- if suffix_part:
- new_project_full_name = f"{main_part} {derived_project_name} {suffix_part}"
- else:
- new_project_full_name = f"{main_part} {derived_project_name}"
- new_project_full_name = re.sub(r" +", " ", new_project_full_name).strip()
-
- # Check whether the derived project already exists by its constructed label
- if await data.project(name=new_project_label).get():
- raise routes.FlashError(f"Derived project {new_project_label} already exists")
-
- project = models.Project(
- name=new_project_label,
- full_name=new_project_full_name,
- is_podling=base_project.is_podling,
- is_retired=base_project.is_retired,
- description=base_project.description,
- category=base_project.category,
- programming_languages=base_project.programming_languages,
- committee_id=base_project.committee_id,
- vote_policy_id=base_project.vote_policy_id,
- created=datetime.datetime.now(datetime.UTC),
- created_by=asf_id,
- )
-
- data.add(project)
- await data.commit()
-
- return quart.redirect(util.as_url(view, name=new_project_label))
-
-
@routes.committer("/project/delete", methods=["POST"])
async def delete(session: routes.CommitterSession) -> response.Response:
"""Delete a project created by the user."""
@@ -190,39 +158,6 @@ async def view(name: str) -> str:
return await quart.render_template("project-view.html", project=project, algorithms=routes.algorithms)
-class VotePolicyForm(util.QuartFormTyped):
- """
- A Form to create/edit a VotePolicy.
-
- TODO: Currently only a single mailto_address is supported.
- see: https://stackoverflow.com/questions/49066046/append-entry-to-fieldlist-with-flask-wtforms-using-ajax
- """
-
- project_name = wtforms.HiddenField("project_name")
- mailto_addresses = wtforms.FieldList(
- wtforms.StringField(
- "Email",
- validators=[
- wtforms.validators.InputRequired("Please provide a valid email address"),
- wtforms.validators.Email(),
- ],
- ),
- min_entries=1,
- )
- min_hours = wtforms.IntegerField(
- "Minimum Voting Period:",
- validators=[
- wtforms.validators.NumberRange(min=0, max=144, message="Voting period must be between 0h and 144h")
- ],
- default=72,
- )
- manual_vote = wtforms.BooleanField("Voting Process:")
- release_checklist = wtforms.StringField("Release Checklist:", widget=wtforms.widgets.TextArea())
- pause_for_rm = wtforms.BooleanField("Pause for RM:")
-
- submit = wtforms.SubmitField("Save")
-
-
@routes.committer("/projects/<project_name>/vote-policy/add", methods=["GET", "POST"])
async def vote_policy_add(session: routes.CommitterSession, project_name: str) -> response.Response | str:
uid = await util.get_asf_id_or_die()
@@ -289,6 +224,71 @@ async def vote_policy_edit(session: routes.CommitterSession, project_name: str)
)
+async def _add_project(form: AddFormProtocol, asf_id: str) -> response.Response:
+ base_project_name = str(form.project_name.data)
+ derived_project_name = str(form.derived_project_name.data).strip()
+
+ def _generate_label(text: str) -> str:
+ # TODO: We should probably add long name validation
+ text = text.lower()
+ text = re.sub(r" +", "-", text)
+ text = re.sub(r"[^a-z0-9-]", "", text)
+ return text
+
+ async with db.session() as data:
+ # Get the base project to derive from
+ base_project = await data.project(name=base_project_name).get()
+ if not base_project:
+ # This should not happen, assuming that the dropdown is populated correctly
+ raise routes.FlashError(f"Base project {base_project_name} not found")
+
+ # Construct the new label
+ derived_label = _generate_label(derived_project_name)
+ if not derived_label:
+ raise routes.FlashError("Derived project name must contain valid characters for label generation")
+ new_project_label = f"{base_project.name}-{derived_label}"
+
+ # Construct the new full name
+ # We ensure that parenthesised suffixes like "(Incubating)" are preserved
+ base_name = base_project.full_name or base_project.name
+ match = re.match(r"^(.*?) *(\(.*\))?$", base_name)
+ if match:
+ main_part = match.group(1).strip()
+ suffix_part = match.group(2)
+ else:
+ main_part = base_name.strip()
+ suffix_part = None
+
+ if suffix_part:
+ new_project_full_name = f"{main_part} {derived_project_name} {suffix_part}"
+ else:
+ new_project_full_name = f"{main_part} {derived_project_name}"
+ new_project_full_name = re.sub(r" +", " ", new_project_full_name).strip()
+
+ # Check whether the derived project already exists by its constructed label
+ if await data.project(name=new_project_label).get():
+ raise routes.FlashError(f"Derived project {new_project_label} already exists")
+
+ project = models.Project(
+ name=new_project_label,
+ full_name=new_project_full_name,
+ is_podling=base_project.is_podling,
+ is_retired=base_project.is_retired,
+ description=base_project.description,
+ category=base_project.category,
+ programming_languages=base_project.programming_languages,
+ committee_id=base_project.committee_id,
+ vote_policy_id=base_project.vote_policy_id,
+ created=datetime.datetime.now(datetime.UTC),
+ created_by=asf_id,
+ )
+
+ data.add(project)
+ await data.commit()
+
+ return quart.redirect(util.as_url(view, name=new_project_label))
+
+
async def _add_voting_policy(project: models.Project, form: VotePolicyForm, data: db.Session) -> response.Response:
project_name = str(form.project_name.data)
diff --git a/atr/routes/release.py b/atr/routes/release.py
index 89ec6dd..d5bde4b 100644
--- a/atr/routes/release.py
+++ b/atr/routes/release.py
@@ -35,6 +35,27 @@ if asfquart.APP is ...:
raise RuntimeError("APP is not set")
+@routes.committer("/release/mark-announced/<project_name>/<version_name>", methods=["POST"])
+async def mark_announced(session: routes.CommitterSession, project_name: str, version_name: str) -> response.Response:
+ """Mark a release as announced."""
+ async with db.session() as data:
+ release_name = models.release_name(project_name, version_name)
+ release = await data.release(name=release_name, _project=True).get()
+
+ if not release:
+ return await session.redirect(releases, error=f"Release {release_name} not found.")
+
+ if release.phase != models.ReleasePhase.RELEASE_BEFORE_ANNOUNCEMENT:
+ return await session.redirect(
+ releases, error=f"Release {release_name} is not in the 'before announcement' phase."
+ )
+
+ release.phase = models.ReleasePhase.RELEASE_AFTER_ANNOUNCEMENT
+ await data.commit()
+
+ return await session.redirect(releases, success=f"Release {release_name} marked as announced.")
+
+
@routes.committer("/release/bulk/<int:task_id>", methods=["GET"])
async def release_bulk_status(session: routes.CommitterSession, task_id: int) -> str | response.Response:
"""Show status for a bulk download task."""
@@ -95,27 +116,6 @@ async def releases(session: routes.CommitterSession) -> str:
)
-@routes.committer("/release/mark-announced/<project_name>/<version_name>", methods=["POST"])
-async def mark_announced(session: routes.CommitterSession, project_name: str, version_name: str) -> response.Response:
- """Mark a release as announced."""
- async with db.session() as data:
- release_name = models.release_name(project_name, version_name)
- release = await data.release(name=release_name, _project=True).get()
-
- if not release:
- return await session.redirect(releases, error=f"Release {release_name} not found.")
-
- if release.phase != models.ReleasePhase.RELEASE_BEFORE_ANNOUNCEMENT:
- return await session.redirect(
- releases, error=f"Release {release_name} is not in the 'before announcement' phase."
- )
-
- release.phase = models.ReleasePhase.RELEASE_AFTER_ANNOUNCEMENT
- await data.commit()
-
- return await session.redirect(releases, success=f"Release {release_name} marked as announced.")
-
-
@routes.committer("/release/view/<project_name>/<version_name>")
async def view(session: routes.CommitterSession, project_name: str, version_name: str) -> response.Response | str:
"""View all the files in the rsync upload directory for a release."""
diff --git a/scripts/interface_order.py b/scripts/interface_order.py
index c288847..e7f571d 100644
--- a/scripts/interface_order.py
+++ b/scripts/interface_order.py
@@ -57,7 +57,7 @@ def _verify_names_are_sorted(names: Sequence[str], filename: str) -> bool:
a = _toggle_sortability(names[i])
b = _toggle_sortability(names[i + 1])
print(
- f"Error: Function '{b}' in {filename} is not ordered correctly relative to '{a}'",
+ f"!! {filename} - function '{b}' is misordered relative to '{a}'",
file=sys.stderr,
)
return False
@@ -81,11 +81,11 @@ def main() -> None:
function_names = _extract_top_level_function_names(tree)
if not function_names:
- print(f"No top level functions found in {file_path}. Nothing to check")
+ print(f"ok {file_path} - no top level functions")
sys.exit(ExitCode.SUCCESS)
if _verify_names_are_sorted(function_names, str(file_path)):
- print(f"Top level functions in {file_path} are alphabetically ordered")
+ print(f"ok {file_path}")
sys.exit(ExitCode.SUCCESS)
else:
sys.exit(ExitCode.FAILURE)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org