replace easybuild templates with f-strings on Java 8 easyconfigs

easybuilders · Dec 23, 2024 · a727bee · a727bee
1 parent ce19c48
commit a727bee
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 38 deletions.
diff --git a/easybuild/easyconfigs/j/Java/Java-8.345.eb b/easybuild/easyconfigs/j/Java/Java-8.345.eb
@@ -1,28 +1,28 @@
 name = 'Java'
-version = '8.345'
-local_build = 'b01'
+_java_version = '8'
+_patch_version = '345'
+_build_version = 'b01'
+version = f'{_java_version}.{_patch_version}'
 
 homepage = 'http://openjdk.java.net'
 description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
 Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'OpenJDK8U-jdk_%s_linux_hotspot_%%(version_major)su%%(version_minor)s%s.tar.gz'
-
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin8-binaries/releases/download/'
-               'jdk%%(version_major)su%%(version_minor)s-%s/' % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot'
+_tarball_tmpl += f'_{_java_version}u{_patch_version}{_build_version}.tar.gz'
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk{_java_version}u{_patch_version}-{_build_version}/']
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             'ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             'c1965fb24dded7d7944e2da36cd902adf3b7b1d327aaa21ea507cff00a5a0090',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             'f2be72678f6c2ad283453d0e21a6cb03144dda356e4edf79f818d99c37feaf34',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-8.362.eb b/easybuild/easyconfigs/j/Java/Java-8.362.eb
@@ -1,30 +1,29 @@
 name = 'Java'
-version = '8.362'
-local_build = 'b09'
+_java_version = '8'
+_patch_version = '362'
+_build_version = 'b09'
+version = f'{_java_version}.{_patch_version}'
 
 homepage = 'http://openjdk.java.net'
 description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
 Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'OpenJDK8U-jdk_%s_linux_hotspot_%%(version_major)su%%(version_minor)s%s.tar.gz'
-
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin8-binaries/releases/download/'
-               'jdk%%(version_major)su%%(version_minor)s-%s/' % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot'
+_tarball_tmpl += f'_{_java_version}u{_patch_version}{_build_version}.tar.gz'
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk{_java_version}u{_patch_version}-{_build_version}/']
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             '1486a792fb224611ce0cd0e83d4aacd3503b56698549f8e9a9f0a6ebb83bdba1',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '9290a8beefd7a94f0eb030f62d402411a852100482b9c5b63714bacc57002c2a',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             '69658dd316c6a160915655971573179766e19c6610ea03880c1e578a0e518f74',
-
     }
 ]
 

diff --git a/easybuild/easyconfigs/j/Java/Java-8.402.eb b/easybuild/easyconfigs/j/Java/Java-8.402.eb
@@ -1,30 +1,29 @@
 name = 'Java'
-version = '8.402'
-local_build = 'b06'
+_java_version = '8'
+_patch_version = '402'
+_build_version = 'b06'
+version = f'{_java_version}.{_patch_version}'
 
 homepage = 'http://openjdk.java.net'
 description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
 Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'OpenJDK8U-jdk_%s_linux_hotspot_%%(version_major)su%%(version_minor)s%s.tar.gz'
-
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin8-binaries/releases/download/'
-               'jdk%%(version_major)su%%(version_minor)s-%s/' % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot'
+_tarball_tmpl += f'_{_java_version}u{_patch_version}{_build_version}.tar.gz'
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk{_java_version}u{_patch_version}-{_build_version}/']
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             'fcfd08abe39f18e719e391f2fc37b8ac1053075426d10efac4cbf8969e7aa55e',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '241a72d6f0051de30c71e7ade95b34cd85a249c8e5925bcc7a95872bee81fd84',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             '64bc05cdffe827c84000177dca2eb4ff0a8ff0021889bb75abff3639d4f51838',
-
     }
 ]