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 3166e6b Change the refine phase to the deploy phase
3166e6b is described below
commit 3166e6b83dcb1c33e365369d4f50187ef3cf54e0
Author: Sean B. Palmer <[email protected]>
AuthorDate: Thu Apr 24 14:44:26 2025 +0100
Change the refine phase to the deploy phase
---
atr/routes/candidate.py | 2 +-
atr/routes/mapping.py | 4 ++--
atr/routes/preview.py | 14 +++++++-------
atr/routes/root.py | 2 +-
atr/templates/draft-revisions.html | 6 +++---
atr/templates/index-committer.html | 2 +-
atr/templates/phase-view.html | 6 +++---
atr/templates/preview-announce-release.html | 6 +++---
...iew-refine-release.html => preview-deploy-release.html} | 0
playwright/test.py | 8 ++++----
10 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/atr/routes/candidate.py b/atr/routes/candidate.py
index e5168c8..8193cad 100644
--- a/atr/routes/candidate.py
+++ b/atr/routes/candidate.py
@@ -270,7 +270,7 @@ async def _resolve_post(session: routes.CommitterSession)
-> response.Response:
await _resolve_post_files(project_name, release, source, vote_result,
session.uid)
return await session.redirect(
- preview.refine_release, success=success_message,
project_name=project_name, version_name=release.version
+ preview.deploy_release, success=success_message,
project_name=project_name, version_name=release.version
)
diff --git a/atr/routes/mapping.py b/atr/routes/mapping.py
index 8bf94b8..c4cdd97 100644
--- a/atr/routes/mapping.py
+++ b/atr/routes/mapping.py
@@ -29,7 +29,7 @@ def release_as_url(release: models.Release) -> str:
resolve_release = candidate.resolve_release # type: ignore[has-type]
return util.as_url(resolve_release, project_name=release.project.name,
version_name=release.version)
elif release.phase.value == "release_preview":
- refine_release = preview.refine_release # type: ignore[has-type]
- return util.as_url(refine_release, project_name=release.project.name,
version_name=release.version)
+ deploy_release = preview.deploy_release # type: ignore[has-type]
+ return util.as_url(deploy_release, project_name=release.project.name,
version_name=release.version)
else:
raise ValueError(f"Unknown release phase: {release.phase}")
diff --git a/atr/routes/preview.py b/atr/routes/preview.py
index f970e13..a682a77 100644
--- a/atr/routes/preview.py
+++ b/atr/routes/preview.py
@@ -244,11 +244,11 @@ async def previews(session: routes.CommitterSession) ->
str:
)
[email protected]("/refine/<project_name>/<version_name>", methods=["GET",
"POST"])
-async def refine_release(
[email protected]("/deploy/<project_name>/<version_name>", methods=["GET",
"POST"])
+async def deploy_release(
session: routes.CommitterSession, project_name: str, version_name: str
) -> response.Response | str:
- """Refine a release preview."""
+ """Deploy a release preview."""
await session.check_access(project_name)
release = await session.release(project_name, version_name,
phase=models.ReleasePhase.RELEASE_PREVIEW)
@@ -279,7 +279,7 @@ async def refine_release(
return r
return await quart.render_template(
- "preview-refine-release.html", release=release,
file_paths=sorted(file_paths_rel), form=form, can_move=can_move
+ "preview-deploy-release.html", release=release,
file_paths=sorted(file_paths_rel), form=form, can_move=can_move
)
@@ -399,7 +399,7 @@ async def _move_file(
f"File '{source_file_rel.name}' already exists in
'{target_dir_rel}' in new revision.",
"error",
)
- return await session.redirect(refine_release,
project_name=project_name, version_name=version_name)
+ return await session.redirect(deploy_release,
project_name=project_name, version_name=version_name)
_LOGGER.info(f"Moving {source_path_in_new} to
{target_path_in_new} in new revision {new_revision_name}")
await aiofiles.os.rename(source_path_in_new,
target_path_in_new)
@@ -407,7 +407,7 @@ async def _move_file(
await quart.flash(
f"File '{source_file_rel.name}' moved successfully to
'{target_dir_rel}' in new revision.", "success"
)
- return await session.redirect(refine_release,
project_name=project_name, version_name=version_name)
+ return await session.redirect(deploy_release,
project_name=project_name, version_name=version_name)
except FileNotFoundError:
_LOGGER.exception("File not found during move operation in new
revision")
@@ -418,7 +418,7 @@ async def _move_file(
except Exception as e:
_LOGGER.exception("Unexpected error during file move")
await quart.flash(f"An unexpected error occurred: {e!s}", "error")
- return await session.redirect(refine_release,
project_name=project_name, version_name=version_name)
+ return await session.redirect(deploy_release,
project_name=project_name, version_name=version_name)
else:
for field, errors in form.errors.items():
field_label = getattr(getattr(form, field, None), "label", None)
diff --git a/atr/routes/root.py b/atr/routes/root.py
index c1cc9fa..4950f8e 100644
--- a/atr/routes/root.py
+++ b/atr/routes/root.py
@@ -38,7 +38,7 @@ async def index() -> response.Response | str:
if not uid:
return await quart.render_template("index-public.html")
- phase_sequence = ["Compose", "Vote", "Refine"]
+ phase_sequence = ["Compose", "Vote", "Deploy"]
phase_index_map = {
models.ReleasePhase.RELEASE_CANDIDATE_DRAFT: 0,
models.ReleasePhase.RELEASE_CANDIDATE: 1,
diff --git a/atr/templates/draft-revisions.html
b/atr/templates/draft-revisions.html
index 5a7e114..8ded4b8 100644
--- a/atr/templates/draft-revisions.html
+++ b/atr/templates/draft-revisions.html
@@ -22,15 +22,15 @@
<span class="atr-phase-symbol-other">③</span>
</span>
{% elif phase_key == "preview" %}
- <a href="{{ as_url(routes.preview.refine_release,
project_name=release.project.name, version_name=release.version) }}"
- class="atr-back-link">← Back to Refine {{ release.short_display_name
}}</a>
+ <a href="{{ as_url(routes.preview.deploy_release,
project_name=release.project.name, version_name=release.version) }}"
+ class="atr-back-link">← Back to Deploy {{ release.short_display_name
}}</a>
<span>
<span class="atr-phase-symbol-other">①</span>
<span class="atr-phase-arrow">→</span>
<strong class="atr-phase-symbol-other">②</strong>
<span class="atr-phase-arrow">→</span>
<strong class="atr-phase-three atr-phase-symbol">③</strong>
- <span class="atr-phase-three atr-phase-label">REFINE</span>
+ <span class="atr-phase-three atr-phase-label">DEPLOY</span>
</span>
{% else %}
<a href="{{ as_url(routes.root.index) }}" class="atr-back-link">← Back
to Select a release</a>
diff --git a/atr/templates/index-committer.html
b/atr/templates/index-committer.html
index 52fbe9e..50ede50 100644
--- a/atr/templates/index-committer.html
+++ b/atr/templates/index-committer.html
@@ -104,7 +104,7 @@
<div class="atr-phase-themed mb-2">
{# set phase_symbols = ["1.", "2.", "3."] #}
{% set phase_symbols = ["①", "②", "③"] %}
- {% set phase_labels = ["Compose", "Vote", "Refine"] %}
+ {% set phase_labels = ["Compose", "Vote", "Deploy"] %}
{% if current_phase_index == 0 %}
<strong class="atr-phase-one atr-phase-symbol">{{
phase_symbols[0] }}</strong>
diff --git a/atr/templates/phase-view.html b/atr/templates/phase-view.html
index 3bccfdb..a97df2f 100644
--- a/atr/templates/phase-view.html
+++ b/atr/templates/phase-view.html
@@ -33,15 +33,15 @@
<span class="atr-phase-symbol-other">③</span>
</span>
{% elif phase_key == "preview" %}
- <a href="{{ as_url(routes.preview.refine_release,
project_name=release.project.name, version_name=release.version) }}"
- class="atr-back-link">← Back to Refine {{ release.short_display_name
}}</a>
+ <a href="{{ as_url(routes.preview.deploy_release,
project_name=release.project.name, version_name=release.version) }}"
+ class="atr-back-link">← Back to Deploy {{ release.short_display_name
}}</a>
<span>
<span class="atr-phase-symbol-other">①</span>
<span class="atr-phase-arrow">→</span>
<span class="atr-phase-symbol-other">②</span>
<span class="atr-phase-arrow">→</span>
<strong class="atr-phase-three atr-phase-symbol">③</strong>
- <span class="atr-phase-three atr-phase-label">REFINE</span>
+ <span class="atr-phase-three atr-phase-label">DEPLOY</span>
</span>
{% else %}
<a href="{{ as_url(routes.release.releases) }}" class="atr-back-link">←
Back to Releases</a>
diff --git a/atr/templates/preview-announce-release.html
b/atr/templates/preview-announce-release.html
index 3113f78..752ab80 100644
--- a/atr/templates/preview-announce-release.html
+++ b/atr/templates/preview-announce-release.html
@@ -25,15 +25,15 @@
{% block content %}
<p class="d-flex justify-content-between align-items-center">
- <a href="{{ as_url(routes.preview.refine_release,
project_name=release.project.name, version_name=release.version) }}"
- class="atr-back-link">← Back to Refine {{ release.short_display_name
}}</a>
+ <a href="{{ as_url(routes.preview.deploy_release,
project_name=release.project.name, version_name=release.version) }}"
+ class="atr-back-link">← Back to Deploy {{ release.short_display_name
}}</a>
<span>
<span class="atr-phase-symbol-other">①</span>
<span class="atr-phase-arrow">→</span>
<strong class="atr-phase-symbol-other">②</strong>
<span class="atr-phase-arrow">→</span>
<strong class="atr-phase-three atr-phase-symbol">③</strong>
- <span class="atr-phase-three atr-phase-label">REFINE</span>
+ <span class="atr-phase-three atr-phase-label">DEPLOY</span>
</span>
</p>
diff --git a/atr/templates/preview-refine-release.html
b/atr/templates/preview-deploy-release.html
similarity index 100%
rename from atr/templates/preview-refine-release.html
rename to atr/templates/preview-deploy-release.html
diff --git a/playwright/test.py b/playwright/test.py
index 93b4f9d..66c0437 100644
--- a/playwright/test.py
+++ b/playwright/test.py
@@ -206,14 +206,14 @@ def lifecycle_05_resolve_vote(page: sync_api.Page,
credentials: Credentials, ver
sync_api.expect(submit_button_locator).to_be_enabled()
submit_button_locator.click()
- logging.info(f"Waiting for navigation to
/refine/tooling-test-example/{version_name} after resolving the vote")
- wait_for_path(page, f"/refine/tooling-test-example/{version_name}")
+ logging.info(f"Waiting for navigation to
/deploy/tooling-test-example/{version_name} after resolving the vote")
+ wait_for_path(page, f"/deploy/tooling-test-example/{version_name}")
logging.info("Vote resolution actions completed successfully")
def lifecycle_06_announce_preview(page: sync_api.Page, credentials:
Credentials, version_name: str) -> None:
- go_to_path(page, f"/refine/tooling-test-example/{version_name}")
- logging.info("Refine page loaded successfully")
+ go_to_path(page, f"/deploy/tooling-test-example/{version_name}")
+ logging.info("Deploy page loaded successfully")
logging.info(f"Locating the announce link for tooling-test-example
{version_name}")
announce_link_locator =
page.locator(f'a[href="/announce/tooling-test-example/{esc_id(version_name)}"]')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
