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/21 16:25:38 UTC
(tooling-trusted-release) branch main updated: Rename the RELEASE_AFTER_ANNOUNCEMENT phase to RELEASE
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 a66ae7e Rename the RELEASE_AFTER_ANNOUNCEMENT phase to RELEASE
a66ae7e is described below
commit a66ae7ef0c69b68360754a3dd9ff426100e66638
Author: Sean B. Palmer <se...@miscoranda.com>
AuthorDate: Mon Apr 21 17:25:21 2025 +0100
Rename the RELEASE_AFTER_ANNOUNCEMENT phase to RELEASE
---
atr/blueprints/admin/templates/releases.html | 4 ++--
atr/db/models.py | 11 ++++-------
atr/routes/preview.py | 2 +-
atr/routes/release.py | 6 +++---
atr/util.py | 4 ++--
playwright/test.py | 6 +++---
6 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/atr/blueprints/admin/templates/releases.html b/atr/blueprints/admin/templates/releases.html
index 60cd878..5541740 100644
--- a/atr/blueprints/admin/templates/releases.html
+++ b/atr/blueprints/admin/templates/releases.html
@@ -34,7 +34,7 @@
<a href="{{ as_url(routes.candidate.resolve) }}">{{ release.name }}</a>
{% elif phase_value == "release_preview" %}
<a href="{{ as_url(routes.preview.review) }}">{{ release.name }}</a>
- {% elif phase_value == "release_after_announcement" %}
+ {% elif phase_value == "release" %}
<a href="{{ as_url(routes.release.review) }}">{{ release.name }}</a>
{% else %}
{{ release.name }}
@@ -55,7 +55,7 @@
<span class="badge bg-info">2. Candidate</span>
{% elif phase_value == "release_preview" %}
<span class="badge bg-warning text-dark">3. Preview</span>
- {% elif phase_value == "release_after_announcement" %}
+ {% elif phase_value == "release" %}
<span class="badge bg-success">4. Release</span>
{% else %}
<span class="badge bg-dark">Unknown</span>
diff --git a/atr/db/models.py b/atr/db/models.py
index 2a85273..4e9b276 100644
--- a/atr/db/models.py
+++ b/atr/db/models.py
@@ -222,7 +222,7 @@ class Project(sqlmodel.SQLModel, table=True):
@property
async def full_releases(self) -> list["Release"]:
"""Get the full releases for the project."""
- return await self.releases_by_phase(ReleasePhase.RELEASE_AFTER_ANNOUNCEMENT)
+ return await self.releases_by_phase(ReleasePhase.RELEASE)
@property
async def releases_in_progress(self) -> list["Release"]:
@@ -289,17 +289,14 @@ class ReleaseStage(str, enum.Enum):
class ReleasePhase(str, enum.Enum):
- # [CANDIDATE]
# Step 1: The candidate files are added from external sources and checked by ATR
RELEASE_CANDIDATE_DRAFT = "release_candidate_draft"
# Step 2: The project members are voting on the candidate release
RELEASE_CANDIDATE = "release_candidate"
-
- # [RELEASE]
- # Step 1: The release files are being put in place
+ # Step 3: The release files are being put in place
RELEASE_PREVIEW = "release_preview"
- # Step 2: The release has been announced
- RELEASE_AFTER_ANNOUNCEMENT = "release_after_announcement"
+ # Step 4: The release has been announced
+ RELEASE = "release"
class TaskStatus(str, enum.Enum):
diff --git a/atr/routes/preview.py b/atr/routes/preview.py
index f496166..bb6f84f 100644
--- a/atr/routes/preview.py
+++ b/atr/routes/preview.py
@@ -131,7 +131,7 @@ async def announce(session: routes.CommitterSession) -> str | response.Response:
if await aiofiles.os.path.exists(target):
return await session.redirect(announce, error="Release already exists")
- release.phase = models.ReleasePhase.RELEASE_AFTER_ANNOUNCEMENT
+ release.phase = models.ReleasePhase.RELEASE
release.revision = None
await data.commit()
await aioshutil.move(source, target)
diff --git a/atr/routes/release.py b/atr/routes/release.py
index a43fab7..9dd6733 100644
--- a/atr/routes/release.py
+++ b/atr/routes/release.py
@@ -88,16 +88,16 @@ async def releases(session: routes.CommitterSession) -> str:
"""View all releases."""
# Releases are public, so we don't need to filter by user
async with db.session() as data:
- releases_after_announcement = await data.release(
+ releases = await data.release(
stage=models.ReleaseStage.RELEASE,
- phase=models.ReleasePhase.RELEASE_AFTER_ANNOUNCEMENT,
+ phase=models.ReleasePhase.RELEASE,
_committee=True,
_packages=True,
).all()
return await quart.render_template(
"releases.html",
- releases=list(releases_after_announcement),
+ releases=list(releases),
)
diff --git a/atr/util.py b/atr/util.py
index 8f4d642..fda0e74 100644
--- a/atr/util.py
+++ b/atr/util.py
@@ -304,7 +304,7 @@ async def number_of_release_files(release: models.Release) -> int:
path = get_release_candidate_dir() / path_project / path_version
case models.ReleasePhase.RELEASE_PREVIEW:
path = get_release_preview_dir() / path_project / path_version / path_revision
- case models.ReleasePhase.RELEASE_AFTER_ANNOUNCEMENT:
+ case models.ReleasePhase.RELEASE:
path = get_release_dir() / path_project / path_version
case _:
raise ValueError(f"Unknown release phase: {release.phase}")
@@ -409,7 +409,7 @@ def release_directory(release: models.Release) -> pathlib.Path:
base_dir = get_release_candidate_dir()
case models.ReleasePhase.RELEASE_PREVIEW:
base_dir = get_release_preview_dir()
- case models.ReleasePhase.RELEASE_AFTER_ANNOUNCEMENT:
+ case models.ReleasePhase.RELEASE:
base_dir = get_release_dir()
# NOTE: Do NOT add "case _" here
diff --git a/playwright/test.py b/playwright/test.py
index 80e3067..4cd1c0a 100644
--- a/playwright/test.py
+++ b/playwright/test.py
@@ -711,12 +711,12 @@ def test_lifecycle_07_release_exists(page: sync_api.Page, credentials: Credentia
logging.info("Found card for tooling-test-example-0.1 release")
logging.info("Release tooling-test-example-0.1 confirmed exists on /releases page")
- logging.info("Verifying release tooling-test-example-0.1 phase is RELEASE_AFTER_ANNOUNCEMENT")
+ logging.info("Verifying release tooling-test-example-0.1 phase is RELEASE")
release_card_locator = page.locator('div.card:has(h3:has-text("Apache Tooling Test Example 0.1"))')
sync_api.expect(release_card_locator).to_be_visible()
- phase_locator = release_card_locator.locator('span.release-meta-item:has-text("Phase: RELEASE_AFTER_ANNOUNCEMENT")')
+ phase_locator = release_card_locator.locator('span.release-meta-item:has-text("Phase: RELEASE")')
sync_api.expect(phase_locator).to_be_visible()
- logging.info("Phase confirmed as RELEASE_AFTER_ANNOUNCEMENT")
+ logging.info("Phase confirmed as RELEASE")
def test_login(page: sync_api.Page, credentials: Credentials) -> None:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org