You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by ar...@apache.org on 2026/09/22 10:17:36 UTC

(tooling-trusted-releases) branch arm updated: Update catalog archives

This is an automated email from the ASF dual-hosted git repository.

alitheg 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 df1574d0 Update catalog archives
df1574d0 is described below

commit df1574d077e780cc0b748d35118ab9431be33eea
Author: Alastair McFarlane <ar...@apache.org>
AuthorDate: Tue Sep 22 11:17:06 2026 +0100

    Update catalog archives
---
 atr/catalog_site.py                     | 34 ++++++++++++++++++++-------------
 atr/templates/catalog_site/project.html |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/atr/catalog_site.py b/atr/catalog_site.py
index 3fb4c8f1..975bd5e0 100644
--- a/atr/catalog_site.py
+++ b/atr/catalog_site.py
@@ -182,6 +182,8 @@ class _SubprojectSummary:
     release_count: int
     latest_date: datetime.datetime | None
     has_archived: bool
+    # The most recent archived release's date, for a subproject with nothing current left
+    last_archived_date: datetime.datetime | None
 
 
 @dataclasses.dataclass
@@ -675,19 +677,25 @@ async def _subproject_summaries(data: db.Session, subprojects: Sequence[sql.Proj
 
 
 async def _subproject_summary(data: db.Session, project: sql.Project) -> _SubprojectSummary:
-    releases = await data.release(project_key=project.key, phase=sql.ReleasePhase.RELEASE).all()
-    release_count = 0
-    latest_date: datetime.datetime | None = None
-    has_archived = False
-    for release in releases:
-        if release.is_archived:
-            has_archived = True
-            continue
-        release_count += 1
-        released = release.released or release.created
-        if (latest_date is None) or (released > latest_date):
-            latest_date = released
-    return _SubprojectSummary(release_count=release_count, latest_date=latest_date, has_archived=has_archived)
+    # Count from the same assembled view the subproject's own page uses, so the parent
+    # summary and that page can't disagree over what counts as a release. A version whose
+    # release sits in a stale draft phase still counts, the way it does on that page.
+    now = datetime.datetime.now(datetime.UTC)
+    artifacts = await data.artifact(project_key=project.key, _release=True).all()
+    project_cycles = await data.project_cycle(project_key=project.key).all()
+    assembled = catalog.assemble(project.version_method, artifacts, project_cycles, now)
+    current = [version for version in assembled.versions if version.status == "released"]
+    archived = [version for version in assembled.versions if version.status == "archived"]
+    return _SubprojectSummary(
+        release_count=len(current),
+        latest_date=_latest_release_date(current),
+        has_archived=bool(archived),
+        last_archived_date=_latest_release_date(archived),
+    )
+
+
+def _latest_release_date(versions: Sequence[api.CatalogVersion]) -> datetime.datetime | None:
+    return max((version.released for version in versions if version.released is not None), default=None)
 
 
 def _unique(pairs: list[tuple[str, str]]) -> Iterator[tuple[str, str]]:
diff --git a/atr/templates/catalog_site/project.html b/atr/templates/catalog_site/project.html
index e95928f5..88747b30 100644
--- a/atr/templates/catalog_site/project.html
+++ b/atr/templates/catalog_site/project.html
@@ -6,7 +6,7 @@
   {%- if summary.release_count -%}
     {{ summary.release_count }} release{{ "s" if summary.release_count != 1 else "" }}{% if summary.latest_date %} ยท latest {{ summary.latest_date.strftime("%Y-%m-%d") }}{% endif %}
   {%- elif summary.has_archived -%}
-    All releases are archived
+    Last release{% if summary.last_archived_date %}: {{ summary.last_archived_date.strftime("%Y-%m-%d") }}{% endif %}
   {%- else -%}
     No releases
   {%- endif -%}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org