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 6f67859 Rename the completed releases route to finished releases for
consistency
6f67859 is described below
commit 6f678591e5de324619a6375b0e6e95af15917419
Author: Sean B. Palmer <[email protected]>
AuthorDate: Wed May 7 14:39:37 2025 +0100
Rename the completed releases route to finished releases for consistency
---
Makefile | 9 +++++----
atr/routes/announce.py | 8 ++++++--
atr/routes/mapping.py | 4 ++--
atr/routes/release.py | 8 ++++----
atr/templates/index-committer.html | 4 ++--
.../{releases-completed.html => releases-finished.html} | 0
atr/templates/releases.html | 4 ++--
playwright/test.py | 12 +++++-------
8 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index cac0ac9..c88b1e7 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ check-extra:
docs:
for fn in docs/*.md; \
- do cmark "$$fn" > "$${fn%.md}.html"; \
+ do \
+ cmark "$$fn" > "$${fn%.md}.html"; \
done
generate-version:
@@ -69,12 +70,12 @@ run-staging:
serve:
SSH_HOST=127.0.0.1 $(SCRIPTS)/run hypercorn --bind $(BIND) \
- --keyfile key.pem --certfile cert.pem atr.server:app --debug
--reload
+ --keyfile key.pem --certfile cert.pem atr.server:app --debug --reload
serve-local:
APP_HOST=127.0.0.1:8080 LOCAL_DEBUG=1 \
- SSH_HOST=127.0.0.1 $(SCRIPTS)/run hypercorn --bind $(BIND) \
- --keyfile key.pem --certfile cert.pem atr.server:app --debug
--reload
+ SSH_HOST=127.0.0.1 $(SCRIPTS)/run hypercorn --bind $(BIND) \
+ --keyfile key.pem --certfile cert.pem atr.server:app --debug --reload
stop:
scripts/stop
diff --git a/atr/routes/announce.py b/atr/routes/announce.py
index d4963dd..0eae3bf 100644
--- a/atr/routes/announce.py
+++ b/atr/routes/announce.py
@@ -204,8 +204,12 @@ async def selected_post(
version_name=version_name,
)
- routes_release_releases = routes_release.releases # type: ignore[has-type]
- return await session.redirect(routes_release_releases, success="Preview
successfully announced")
+ routes_release_finished = routes_release.finished # type: ignore[has-type]
+ return await session.redirect(
+ routes_release_finished,
+ success="Preview successfully announced",
+ project_name=project_name,
+ )
async def _create_announce_form_instance(
diff --git a/atr/routes/mapping.py b/atr/routes/mapping.py
index b34ad66..5fd8e3d 100644
--- a/atr/routes/mapping.py
+++ b/atr/routes/mapping.py
@@ -32,5 +32,5 @@ def release_as_url(release: models.Release) -> str:
case models.ReleasePhase.RELEASE_PREVIEW:
return util.as_url(finish.selected,
project_name=release.project.name, version_name=release.version)
case models.ReleasePhase.RELEASE:
- completed = routes_release.completed # type: ignore[has-type]
- return util.as_url(completed, project_name=release.project.name)
+ finished = routes_release.finished # type: ignore[has-type]
+ return util.as_url(finished, project_name=release.project.name)
diff --git a/atr/routes/release.py b/atr/routes/release.py
index ebce917..0b35362 100644
--- a/atr/routes/release.py
+++ b/atr/routes/release.py
@@ -71,9 +71,9 @@ async def bulk_status(session: routes.CommitterSession,
task_id: int) -> str | r
return await quart.render_template("release-bulk.html", task=task,
release=release, TaskStatus=models.TaskStatus)
[email protected]("/releases/completed/<project_name>")
-async def completed(project_name: str) -> str:
- """View all completed releases for a project."""
[email protected]("/releases/finished/<project_name>")
+async def finished(project_name: str) -> str:
+ """View all finished releases for a project."""
async with db.session() as data:
project = await data.project(name=project_name).demand(
base.ASFQuartException(f"Project {project_name} not found",
errorcode=404)
@@ -91,7 +91,7 @@ async def completed(project_name: str) -> str:
releases = sorted(releases, key=sort_releases, reverse=True)
return await quart.render_template(
- "releases-completed.html", project=project, releases=releases,
format_datetime=util.format_datetime
+ "releases-finished.html", project=project, releases=releases,
format_datetime=util.format_datetime
)
diff --git a/atr/templates/index-committer.html
b/atr/templates/index-committer.html
index d354aac..6d8c6b2 100644
--- a/atr/templates/index-committer.html
+++ b/atr/templates/index-committer.html
@@ -99,8 +99,8 @@
{% endif %}
{% if completed_releases %}
<span class="text-muted me-2">/</span>
- <a href="{{ as_url(routes.release.completed,
project_name=project.name) }}"
- class="text-decoration-none">Completed releases</a>
+ <a href="{{ as_url(routes.release.finished,
project_name=project.name) }}"
+ class="text-decoration-none">Finished releases</a>
{% endif %}
</p>
diff --git a/atr/templates/releases-completed.html
b/atr/templates/releases-finished.html
similarity index 100%
rename from atr/templates/releases-completed.html
rename to atr/templates/releases-finished.html
diff --git a/atr/templates/releases.html b/atr/templates/releases.html
index 20fda49..86ea1cb 100644
--- a/atr/templates/releases.html
+++ b/atr/templates/releases.html
@@ -33,9 +33,9 @@
<div class="card-body">
<h3 class="card-title mb-3">{{ project_display_name }}</h3>
<p class="card-text">
- <a href="{{ as_url(routes.release.completed,
project_name=project.name) }}"
+ <a href="{{ as_url(routes.release.finished,
project_name=project.name) }}"
class="btn btn-outline-primary">
- <i class="bi bi-folder2-open me-1"></i> Completed releases
(<code>{{ count }}</code>)
+ <i class="bi bi-folder2-open me-1"></i> Finished releases
(<code>{{ count }}</code>)
</a>
</p>
</div>
diff --git a/playwright/test.py b/playwright/test.py
index 6bccd3c..13192d9 100644
--- a/playwright/test.py
+++ b/playwright/test.py
@@ -236,22 +236,20 @@ def lifecycle_06_announce_preview(page: sync_api.Page,
credentials: Credentials,
submit_button_locator.click()
logging.info("Waiting for navigation to /releases after submitting
announcement")
- wait_for_path(page, "/releases")
+ wait_for_path(page, "/releases/finished/tooling-test-example")
logging.info("Preview announcement actions completed successfully")
def lifecycle_07_release_exists(page: sync_api.Page, credentials: Credentials,
version_name: str) -> None:
- logging.info(
- f"Checking for release tooling-test-example {version_name} on
/releases/completed/tooling-test-example"
- )
- go_to_path(page, "/releases/completed/tooling-test-example")
- logging.info("Releases completed page loaded successfully")
+ logging.info(f"Checking for release tooling-test-example {version_name} on
/releases/finished/tooling-test-example")
+ go_to_path(page, "/releases/finished/tooling-test-example")
+ logging.info("Releases finished page loaded successfully")
release_card_locator =
page.locator(f'div.card:has(strong.card-title:has-text("{version_name}"))')
sync_api.expect(release_card_locator).to_be_visible()
logging.info(f"Found card for tooling-test-example {version_name} release")
logging.info(
- f"Release tooling-test-example {version_name} confirmed exists on
/releases/completed/tooling-test-example"
+ f"Release tooling-test-example {version_name} confirmed exists on
/releases/finished/tooling-test-example"
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
