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/08/24 14:15:23 UTC
(tooling-trusted-releases) branch main updated: Update release catalog URL to the real one, and update email to include config var
This is an automated email from the ASF dual-hosted git repository.
alitheg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new a70a1e39 Update release catalog URL to the real one, and update email to include config var
a70a1e39 is described below
commit a70a1e39747b0800f0c572e69b91d3cac061da14
Author: Alastair McFarlane <ar...@apache.org>
AuthorDate: Mon Aug 24 14:41:28 2026 +0100
Update release catalog URL to the real one, and update email to include config var
---
atr/config.py | 4 +++-
atr/construct.py | 4 ++--
tests/unit/test_release_notification.py | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/atr/config.py b/atr/config.py
index 45c1ca17..7b368928 100644
--- a/atr/config.py
+++ b/atr/config.py
@@ -144,7 +144,9 @@ class AppConfig:
GITHUB_TOKEN = _config_secrets("GITHUB_TOKEN", STATE_DIR, default=None, cast=str)
CAP_API_BASE_URL = _ENVIRONMENT_CONFIG("CAP_API_BASE_URL", default="https://cap-test.apache.org")
CAP_ROLE_ACCOUNT_TOKEN = _config_secrets("CAP_ROLE_ACCOUNT_TOKEN", STATE_DIR, default=None, cast=str)
- RELEASE_CATALOG_URL = _config_secrets("RELEASE_CATALOG_URL", STATE_DIR, default="https://catalog.apache.org/")
+ RELEASE_CATALOG_URL = _config_secrets(
+ "RELEASE_CATALOG_URL", STATE_DIR, default="https://release-catalog.apache.org/"
+ )
DEBUG = False
TEMPLATES_AUTO_RELOAD = False
diff --git a/atr/construct.py b/atr/construct.py
index b0904c33..0117a467 100644
--- a/atr/construct.py
+++ b/atr/construct.py
@@ -324,8 +324,8 @@ def release_notification(
) -> args.Send:
# A detected release is one the watcher found published in the dist area rather than
# one ATR made itself, so it's named as such and the body says where it came from
- host = config.get().APP_HOST
- catalogue_url = f"https://{host}/catalog/{project.key}"
+ url = config.get().RELEASE_CATALOG_URL
+ catalogue_url = f"{url}{project.key}"
if detected:
subject = f"Detected release: {project.short_display_name} {version}"
diff --git a/tests/unit/test_release_notification.py b/tests/unit/test_release_notification.py
index 54feb748..7213a004 100644
--- a/tests/unit/test_release_notification.py
+++ b/tests/unit/test_release_notification.py
@@ -48,7 +48,8 @@ def test_release_notification_body_carries_the_version_and_a_catalogue_link():
send = _notification()
assert "1.2.3" in send.body
- assert "/catalog/example" in send.body
+ assert "example" in send.body
+ assert "catalog" in send.body
def test_detected_release_is_named_in_the_subject():
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org