removing illegal jinja logic

Author: stephen-dixon

easybuild/generate_eb.py

@@ -61,12 +61,16 @@ def main():
     output_dir = Path(args.output_dir)
     output_dir.mkdir(parents=True, exist_ok=True)
 
+    if args.git_sha:
+        url = get_source_url(args.git_sha)
+    else:
+        url = get_source_url(args.version)
+
     # Compute checksum if missing
-    checksum = args.checksum 
-    if not checksum and args.git_sha:
-        checksum = get_uda_checksum(args.git_sha)
+    if args.checksum:
+        checksum = args.checksum
     else:
-        checksum = get_uda_checksum(args.version)
+        checksum = calculate_checksum_from_url(url)
 
     # Load template
     env = Environment(loader=FileSystemLoader(args.template_dir), trim_blocks=True, lstrip_blocks=True)
@@ -76,6 +80,7 @@ def main():
     rendered = template.render(
         version=args.version,
         checksum=checksum,
+        source_url=url,
         toolchain_version=args.toolchain_version,
         build_type=args.build_type,
         parallel=args.parallel,

easybuild/templates/uda.eb.j2

@@ -9,14 +9,7 @@ description = """Universal Data Access"""
 toolchain = {'name': 'GCC', 'version': '{{ toolchain_version }}'}
 toolchainopts = {'pic': True}
 
-{% set tag_pattern = r'^\d+\.\d+\.\d+$' %}
-
-{% if version is match(tag_pattern) %}
-source_urls = ['https://github.com/ukaea/UDA/archive/refs/tags']
-{% else %}
-source_urls = ['https://github.com/ukaea/UDA/archive/']
-{% endif %}
-
+source_urls = ['{{ source_url }}']
 sources = ['%(version)s.zip']
 checksums = ['{{ checksum }}']