From 18e6790f461fea32033d7ce94f9550a1799191c8 Mon Sep 17 00:00:00 2001 From: Ake Sandgren Date: Tue, 2 May 2023 08:50:37 +0200 Subject: [PATCH 1/3] change github_* template descriptions to be somewhat clearer. --- easybuild/framework/easyconfig/templates.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/framework/easyconfig/templates.py b/easybuild/framework/easyconfig/templates.py index 603423c20b..43fdc299e1 100644 --- a/easybuild/framework/easyconfig/templates.py +++ b/easybuild/framework/easyconfig/templates.py @@ -114,13 +114,13 @@ ('FTPGNOME_SOURCE', 'https://ftp.gnome.org/pub/GNOME/sources/%(namelower)s/%(version_major_minor)s', 'http download for gnome ftp server'), ('GITHUB_SOURCE', 'https://github.com/%(github_account)s/%(name)s/archive', - 'GitHub source URL (namelower is used if github_account easyconfig parameter is not specified)'), + 'GitHub source URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_LOWER_SOURCE', 'https://github.com/%(github_account)s/%(namelower)s/archive', - 'GitHub source URL (lowercase name, namelower is used if github_account easyconfig parameter is not specified)'), + 'GitHub source URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_RELEASE', 'https://github.com/%(github_account)s/%(name)s/releases/download/v%(version)s', - 'GitHub release URL (namelower is used if github_account easyconfig parameter is not specified)'), + 'GitHub release URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_LOWER_RELEASE', 'https://github.com/%(github_account)s/%(namelower)s/releases/download/v%(version)s', - 'GitHub release URL (namelower is used if github_account easyconfig parameter is not specified)'), + 'GitHub release URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GNU_SAVANNAH_SOURCE', 'https://download-mirror.savannah.gnu.org/releases/%(namelower)s', 'download.savannah.gnu.org source url'), ('GNU_SOURCE', 'https://ftpmirror.gnu.org/gnu/%(namelower)s', From 3f6c1656a4f8e37fe4c83a892f64041d200410e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Sandgren?= Date: Fri, 12 May 2023 07:36:45 +0200 Subject: [PATCH 2/3] Update easybuild/framework/easyconfig/templates.py Co-authored-by: Alexander Grund --- easybuild/framework/easyconfig/templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/framework/easyconfig/templates.py b/easybuild/framework/easyconfig/templates.py index 43fdc299e1..b0acf963b0 100644 --- a/easybuild/framework/easyconfig/templates.py +++ b/easybuild/framework/easyconfig/templates.py @@ -116,7 +116,7 @@ ('GITHUB_SOURCE', 'https://github.com/%(github_account)s/%(name)s/archive', 'GitHub source URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_LOWER_SOURCE', 'https://github.com/%(github_account)s/%(namelower)s/archive', - 'GitHub source URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), + 'GitHub source URL with lowercase name (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_RELEASE', 'https://github.com/%(github_account)s/%(name)s/releases/download/v%(version)s', 'GitHub release URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_LOWER_RELEASE', 'https://github.com/%(github_account)s/%(namelower)s/releases/download/v%(version)s', From a583981842411b23b58868bbd051961573ae4759 Mon Sep 17 00:00:00 2001 From: Ake Sandgren Date: Fri, 12 May 2023 07:44:49 +0200 Subject: [PATCH 3/3] Make GITHUB_LOWER_RELEASE description match GITHUB_LOWER_SOURCE Fix too long line. --- easybuild/framework/easyconfig/templates.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/framework/easyconfig/templates.py b/easybuild/framework/easyconfig/templates.py index b0acf963b0..d0a209c192 100644 --- a/easybuild/framework/easyconfig/templates.py +++ b/easybuild/framework/easyconfig/templates.py @@ -116,11 +116,13 @@ ('GITHUB_SOURCE', 'https://github.com/%(github_account)s/%(name)s/archive', 'GitHub source URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_LOWER_SOURCE', 'https://github.com/%(github_account)s/%(namelower)s/archive', - 'GitHub source URL with lowercase name (if github_account easyconfig parameter is not specified, namelower is used in its place)'), + 'GitHub source URL with lowercase name (if github_account easyconfig ' + 'parameter is not specified, namelower is used in its place)'), ('GITHUB_RELEASE', 'https://github.com/%(github_account)s/%(name)s/releases/download/v%(version)s', 'GitHub release URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), ('GITHUB_LOWER_RELEASE', 'https://github.com/%(github_account)s/%(namelower)s/releases/download/v%(version)s', - 'GitHub release URL (if github_account easyconfig parameter is not specified, namelower is used in its place)'), + 'GitHub release URL with lowercase name (if github_account easyconfig ' + 'parameter is not specified, namelower is used in its place)'), ('GNU_SAVANNAH_SOURCE', 'https://download-mirror.savannah.gnu.org/releases/%(namelower)s', 'download.savannah.gnu.org source url'), ('GNU_SOURCE', 'https://ftpmirror.gnu.org/gnu/%(namelower)s',