Merge pull request #22096 from lexming/java-chksum-templates

replace easybuild templates with f-strings on Java easyconfigs
easybuilders · Dec 26, 2024 · 01f2080 · 01f2080
2 parents b79a9e4 + 6b9de15
commit 01f2080
Show file tree

Hide file tree

Showing 14 changed files with 138 additions and 137 deletions.
diff --git a/easybuild/easyconfigs/j/Java/Java-11.0.16.eb b/easybuild/easyconfigs/j/Java/Java-11.0.16.eb
@@ -1,28 +1,28 @@
 name = 'Java'
-version = '11.0.16'
-local_build = '8'
+_java_version = '11'
+_patch_version = '16'
+_build_version = '8'
+version = f'{_java_version}.0.{_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 = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             'f79506f80c796d8e6a382f00bd8c528a330c5e29581aaf5cb61e1831742d166f',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             'bb345cabf3e305ff3ce390918d5f69e5cfbced3d9844e0b0531c2690f9ed06ef',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             '40dea12da26443ad731f9348187b65451711659337e83b6409a2bcf0f057cd2a',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-11.0.18.eb b/easybuild/easyconfigs/j/Java/Java-11.0.18.eb
@@ -1,28 +1,28 @@
 name = 'Java'
-version = '11.0.18'
-local_build = '10'
+_java_version = '11'
+_patch_version = '18'
+_build_version = '10'
+version = f'{_java_version}.0.{_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 = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             '4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             '459148d489b08ceec2d901e950ac36722b4c55e907e979291ddfc954ebdcea47',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-11.0.20.eb b/easybuild/easyconfigs/j/Java/Java-11.0.20.eb
@@ -1,28 +1,28 @@
 name = 'Java'
-version = '11.0.20'
-local_build = '8'
+_java_version = '11'
+_patch_version = '20'
+_build_version = '8'
+version = f'{_java_version}.0.{_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 = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             '7a99258af2e3ee9047e90f1c0c1775fd6285085759501295358d934d662e01f9',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             'eb821c049c2d2f7c3fbf8ddcce2d608d3aa7d488700e76bfbbebabba93021748',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             '1125931b3a38e6e305a1932fc6cfd0b023a0fbec2cab10e835a2ee2c50848b42',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-16.0.1.eb b/easybuild/easyconfigs/j/Java/Java-16.0.1.eb
@@ -7,15 +7,15 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'openjdk-%%(version)s_linux-%s_bin.tar.gz'
+_tarball_tmpl = f'openjdk-{version}_linux-{{}}_bin.tar.gz'
 
 source_urls = ['https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL']
-sources = [local_tarball_tmpl % '%(jdkarch)s']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % 'x64':
+        _tarball_tmpl.format('x64'):
             'b1198ffffb7d26a3fdedc0fa599f60a0d12aa60da1714b56c1defbce95d8b235',
-        local_tarball_tmpl % 'aarch64':
+        _tarball_tmpl.format('aarch64'):
             '602b005074777df2a0b4306e20152a6446803edd87ccbab95b2f313c4d9be6ba',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.1.eb b/easybuild/easyconfigs/j/Java/Java-17.0.1.eb
@@ -7,15 +7,15 @@ Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'openjdk-%%(version)s_linux-%s_bin.tar.gz'
+_tarball_tmpl = f'openjdk-{version}_linux-{{}}_bin.tar.gz'
 
 source_urls = ['https://download.java.net/java/GA/jdk%(version)s/2a2082e5a09d4267845be086888add4f/12/GPL/']
-sources = [local_tarball_tmpl % '%(jdkarch)s']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % 'x64':
+        _tarball_tmpl.format('x64'):
             '1c0a73cbb863aad579b967316bf17673b8f98a9bb938602a140ba2e5c38f880a',
-        local_tarball_tmpl % 'aarch64':
+        _tarball_tmpl.format('aarch64'):
             '86653d48787e5a1c029df10da7808194fe8bd931ddd72ff3d42850bf1afb317e',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.2.eb b/easybuild/easyconfigs/j/Java/Java-17.0.2.eb
@@ -7,15 +7,15 @@ Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'openjdk-%%(version)s_linux-%s_bin.tar.gz'
+_tarball_tmpl = f'openjdk-{version}_linux-{{}}_bin.tar.gz'
 
 source_urls = ['https://download.java.net/java/GA/jdk%(version)s/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/']
-sources = [local_tarball_tmpl % '%(jdkarch)s']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % 'x64':
+        _tarball_tmpl.format('x64'):
             '0022753d0cceecacdd3a795dd4cea2bd7ffdf9dc06e22ffd1be98411742fbb44',
-        local_tarball_tmpl % 'aarch64':
+        _tarball_tmpl.format('aarch64'):
             '13bfd976acf8803f862e82c7113fb0e9311ca5458b1decaef8a09ffd91119fa4',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.4.eb b/easybuild/easyconfigs/j/Java/Java-17.0.4.eb
@@ -1,28 +1,28 @@
 name = 'Java'
-version = '17.0.4'
-local_build = '8'
+_java_version = '17'
+_patch_version = '4'
+_build_version = '8'
+version = f'{_java_version}.0.{_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 = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             'c0851d610b03cb51e9b360fef3e9ec2026c62837a143e7786649ba94f38cc0d1',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '8c23b0b9c65cfe223a07edb8752026afd1e8ec1682630c2d92db4dd5aa039204',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             'e80a0f6626bd28ea20c43524b3ab10af48b3789317aea5b7019c146fe6268d94',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.6.eb b/easybuild/easyconfigs/j/Java/Java-17.0.6.eb
@@ -1,28 +1,28 @@
 name = 'Java'
-version = '17.0.6'
-local_build = '10'
+_java_version = '17'
+_patch_version = '6'
+_build_version = '10'
+version = f'{_java_version}.0.{_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 = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             'a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             'cb772c3fdf3f9fed56f23a37472acf2b80de20a7113fe09933891c6ef0ecde95',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-19.0.2.eb b/easybuild/easyconfigs/j/Java/Java-19.0.2.eb
@@ -1,28 +1,28 @@
 name = 'Java'
-version = '19.0.2'
-local_build = '7'
+_java_version = '19'
+_patch_version = '2'
+_build_version = '7'
+version = f'{_java_version}.0.{_patch_version}'
 
 homepage = 'https://openjdk.org'
 description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
 Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             '3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '1c4be9aa173cb0deb0d215643d9509c8900e5497290b29eee4bee335fa57984f',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             '173d1256dfb9d13d309b5390e6bdf72d143b512201b0868f9d349d5ed3d64072',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-21.0.2.eb b/easybuild/easyconfigs/j/Java/Java-21.0.2.eb
@@ -1,30 +1,30 @@
 name = 'Java'
-version = '21.0.2'
-local_build = '13'
+_java_version = '21'
+_patch_version = '2'
+_build_version = '13'
+version = f'{_java_version}.0.{_patch_version}'
 
 homepage = 'https://openjdk.org'
 description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
 Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             '454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '3ce6a2b357e2ef45fd6b53d6587aa05bfec7771e7fb982f2c964f6b771b7526a',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             'd08de863499d8851811c893e8915828f2cd8eb67ed9e29432a6b4e222d80a12f',
-        local_tarball_tmpl % ('riscv64', local_build):
+        _tarball_tmpl.format('riscv64'):
             '791a37ddb040e1a02bbfc61abfbc7e7321431a28054c9ac59ba1738fd5320b02',
     }
 ]

diff --git a/easybuild/easyconfigs/j/Java/Java-21.0.5.eb b/easybuild/easyconfigs/j/Java/Java-21.0.5.eb
@@ -1,30 +1,30 @@
 name = 'Java'
-version = '21.0.5'
-local_build = '11'
+_java_version = '21'
+_patch_version = '5'
+_build_version = '11'
+version = f'{_java_version}.0.{_patch_version}'
 
 homepage = 'https://openjdk.org'
 description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
 Java applications on desktops and servers."""
 
 toolchain = SYSTEM
 
-local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz'
+_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz'
 
 # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions
-
-source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/'
-               % local_build]
-sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)]
-
+source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/'
+               f'jdk-{version}+{_build_version}/']
+sources = [_tarball_tmpl.format('%(jdkarch)s')]
 checksums = [
     {
-        local_tarball_tmpl % ('x64', local_build):
+        _tarball_tmpl.format('x64'):
             '3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c',
-        local_tarball_tmpl % ('aarch64', local_build):
+        _tarball_tmpl.format('aarch64'):
             '6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c',
-        local_tarball_tmpl % ('ppc64le', local_build):
+        _tarball_tmpl.format('ppc64le'):
             '3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef',
-        local_tarball_tmpl % ('riscv64', local_build):
+        _tarball_tmpl.format('riscv64'):
             '2f1b3e401e36de803398dfb9818861f9f14ca8ae7db650ea0946ab048fefe3b9',
     }
 ]