stop using deprecated 2-element tuple format in sources, use equivale…

…nt dict format instead
easybuilders · Jun 24, 2017 · 197c4c7 · 197c4c7
1 parent 68fe20b
commit 197c4c7
Show file tree

Hide file tree

Showing 29 changed files with 62 additions and 35 deletions.
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb
@@ -22,9 +22,11 @@ description = """Abinit is a plane wave pseudopotential code for doing
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-# eg. http://ftp.abinit.org/abinit-7.0.3_x86_64_linux_gnu4.5.bz2
-sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
+sources = [{
+    'filename': 'abinit-%%(version)s_%s.bz2' % versionsuffix[1:],
+    'extract_cmd': "tar xfj %s",
+}]
 
 sanity_check_paths = {
     'files': ["bin/abinit"],

diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb
@@ -24,9 +24,11 @@ description = """Abinit is a plane wave pseudopotential code for doing
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-# eg. http://ftp.abinit.org/abinit-7.0.5_x86_64_linux_gnu4.5.bz2
-sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
+sources = [{
+    'filename': 'abinit-%%(version)s_%s.bz2' % versionsuffix[1:],
+    'extract_cmd': "tar xfj %s",
+}]
 
 sanity_check_paths = {
     'files': ["bin/abinit"],

diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb
@@ -25,9 +25,11 @@ description = """Abinit is a plane wave pseudopotential code for doing
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-# eg. http://ftp.abinit.org/abinit-7.0.5_x86_64_linux_gnu4.5.bz2
-sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
+sources = [{
+    'filename': 'abinit-%%(version)s_%s.bz2' % versionsuffix[1:],
+    'extract_cmd': "tar xfj %s",
+}]
 
 sanity_check_paths = {
     'files': ["bin/abinit"],

diff --git a/easybuild/easyconfigs/a/Aspera-CLI/Aspera-CLI-3.7.2.354.010c3b8.eb b/easybuild/easyconfigs/a/Aspera-CLI/Aspera-CLI-3.7.2.354.010c3b8.eb
@@ -22,10 +22,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 # fixed location. Need to include custom extract command to pull
 # tarball out of install script and pipe to tar. %s in the extraction
 # command will be replaced by the source filename.
-sources = [
-    ('%(namelower)s-%(version)s%(versionsuffix)s-linux-64-release.sh',
-     "sed '1,/^__ARCHIVE_FOLLOWS__$/d' %s | tar -xzpo --strip-components 1 -f -")
-]
+sources = [{
+    'filename': '%(namelower)s-%(version)s%(versionsuffix)s-linux-64-release.sh',
+    'extract_cmd': "sed '1,/^__ARCHIVE_FOLLOWS__$/d' %s | tar -xzpo --strip-components 1 -f -",
+}]
 source_urls = ['http://download.asperasoft.com/download/sw/cli/%(version)s']
 checksums = ['02787ca46814fb9ae2de5c706461367e']
 

diff --git a/easybuild/easyconfigs/a/ack/ack-2.14.eb b/easybuild/easyconfigs/a/ack/ack-2.14.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 source_urls = [homepage]
 # use 'cp' as 'unpack' command
-sources = [('ack-%(version)s-single-file', "cp %s ack")]
+sources = [{'filename': 'ack-%(version)s-single-file', 'extract_cmd': "cp %s ack"}]
 
 cmds_map = [('ack', "chmod a+rx ack")]
 

diff --git a/easybuild/easyconfigs/g/GATE/GATE-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GATE/GATE-6.2-goolf-1.4.10.eb
@@ -8,8 +8,11 @@ description = """GATE is an advanced opensource software developed by the intern
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = [('%%(namelower)s_v%s_tar_gz_15843.gz' % '_'.join(version.split('.')), "tar xfvz %s")]
 source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/gate_release/2012/08/']
+sources = [{
+    'filename': '%%(namelower)s_v%s_tar_gz_15843.gz' % '_'.join(version.split('.')),
+    'extract_cmd': "tar xfvz %s",
+}]
 
 patches = [
     'GATE-%(version)s_Makefile-prefix.patch',

diff --git a/easybuild/easyconfigs/g/GATE/GATE-6.2-intel-2015a.eb b/easybuild/easyconfigs/g/GATE/GATE-6.2-intel-2015a.eb
@@ -8,8 +8,11 @@ description = """GATE is an advanced opensource software developed by the intern
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-sources = [('%%(namelower)s_v%s_tar_gz_15843.gz' % '_'.join(version.split('.')), "tar xfvz %s")]
 source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/gate_release/2012/08/']
+sources = [{
+    'filename': '%%(namelower)s_v%s_tar_gz_15843.gz' % '_'.join(version.split('.')),
+    'extract_cmd': "tar xfvz %s",
+}]
 
 patches = [
     'GATE-%(version)s_Makefile-prefix.patch',

diff --git a/easybuild/easyconfigs/g/GATE/GATE-6.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/GATE/GATE-6.2-intel-2016a-Python-2.7.11.eb
@@ -9,8 +9,11 @@ description = """GATE is an advanced opensource software developed by the intern
 
 toolchain = {'name': 'intel', 'version': '2016a'}
 
-sources = [('%%(namelower)s_v%s_tar_gz_15843.gz' % '_'.join(version.split('.')), "tar xfvz %s")]
 source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/gate_release/2012/08/']
+sources = [{
+    'filename': '%%(namelower)s_v%s_tar_gz_15843.gz' % '_'.join(version.split('.')),
+    'extract_cmd': "tar xfvz %s",
+}]
 
 patches = [
     'GATE-%(version)s_Makefile-prefix.patch',

diff --git a/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb b/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb
@@ -8,7 +8,10 @@ description = """GATE is an advanced opensource software developed by the intern
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-sources = [('%(namelower)s_v%(version)s.tar_.gz', "tar xfvz %s")]
+sources = [{
+    'filename': '%(namelower)s_v%(version)s.tar_.gz',
+    'extract_cmd': "tar xfvz %s",
+}]
 source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/']
 
 patches = [

diff --git a/easybuild/easyconfigs/g/GATE/GATE-7.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/GATE/GATE-7.1-intel-2016a-Python-2.7.11.eb
@@ -9,7 +9,10 @@ description = """GATE is an advanced opensource software developed by the intern
 
 toolchain = {'name': 'intel', 'version': '2016a'}
 
-sources = [('%(namelower)s_v%(version)s.tar.gz', "tar xfvz %s")]
+sources = [{
+    'filename': '%(namelower)s_v%(version)s.tar_.gz',
+    'extract_cmd': "tar xfvz %s",
+}]
 source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/']
 
 patches = [

diff --git a/easybuild/easyconfigs/g/GATE/GATE-7.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/GATE/GATE-7.2-intel-2016a-Python-2.7.11.eb
@@ -9,7 +9,10 @@ description = """GATE is an advanced opensource software developed by the intern
 
 toolchain = {'name': 'intel', 'version': '2016a'}
 
-sources = [('%(namelower)s_v%(version)s.tar.gz', "tar xfvz %s")]
+sources = [{
+    'filename': '%(namelower)s_v%(version)s.tar_.gz',
+    'extract_cmd': "tar xfvz %s",
+}]
 source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/']
 
 patches = [

diff --git a/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb b/easybuild/easyconfigs/g/GIMPS/GIMPS-p95v279-GCC-4.8.2.eb
@@ -21,7 +21,10 @@ builddependencies = [('cURL', '7.33.0')]
 
 # make sure unzip works, zipped sources may contain some 'corruption',
 # e.g. "linux64/:  ucsize 306 <> csize 0 for STORED entry"
-sources = [('%(version)s.source.zip', 'unzip -qq %s || /bin/true')]
+sources = [{
+    'filename': '%(version)s.source.zip',
+    'extract_cmd': "unzip -qq %s || /bin/true",
+}]
 # e.g. http://www.mersenne.info/gimps/p95v279.source.zip
 source_urls = ['http://www.mersenne.info/%(namelower)s']
 

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-4.9.4-2.25-LAPACK-3.6.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-4.9.4-2.25-LAPACK-3.6.0.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.3.0-2.26-LAPACK-3.6.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.3.0-2.26-LAPACK-3.6.0.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.4.0-2.26-LAPACK-3.6.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.4.0-2.26-LAPACK-3.6.0.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.4.0-2.26-LAPACK-3.6.1.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.4.0-2.26-LAPACK-3.6.1.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-gompi-2016.07-LAPACK-3.6.1.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-gompi-2016.07-LAPACK-3.6.1.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-GCC-5.4.0-2.26-LAPACK-3.7.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-GCC-5.4.0-2.26-LAPACK-3.7.0.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-GCC-6.3.0-2.27-LAPACK-3.7.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-GCC-6.3.0-2.27-LAPACK-3.7.0.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompi-2016.09-LAPACK-3.6.1.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompi-2016.09-LAPACK-3.6.1.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompic-2016.10-LAPACK-3.6.1.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompic-2016.10-LAPACK-3.6.1.eb
@@ -21,7 +21,7 @@ lapack_unpack_cmd += 'tar -C lapack-netlib --strip-components=1 -zxf %s; cd -'
 
 sources = [
     'v%(version)s.tar.gz',
-    (lapack_src, lapack_unpack_cmd),
+    {'filename': lapack_src, 'extract_cmd': lapack_unpack_cmd},
     large_src,
     timing_src,
 ]

diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-foss-2016a.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-foss-2016a.eb
@@ -19,7 +19,7 @@ source_urls = [
 
 sources = [
     '%(version)s.zip',
-    ('ippicv_linux_20151201.tgz', 'cp %s %(builddir)s'),
+    {'filename': 'ippicv_linux_20151201.tgz', 'extract_cmd': "cp %s %(builddir)s"},
 ]
 
 builddependencies = [

diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-foss-2016b.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-foss-2016b.eb
@@ -19,7 +19,7 @@ source_urls = [
 
 sources = [
     '%(version)s.zip',
-    ('ippicv_linux_20151201.tgz', 'cp %s %(builddir)s'),
+    {'filename': 'ippicv_linux_20151201.tgz', 'extract_cmd': "cp %s %(builddir)s"},
 ]
 
 builddependencies = [

diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-intel-2016a.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-intel-2016a.eb
@@ -19,7 +19,7 @@ source_urls = [
 
 sources = [
     '%(version)s.zip',
-    ('ippicv_linux_20151201.tgz', 'cp %s %(builddir)s'),
+    {'filename': 'ippicv_linux_20151201.tgz', 'extract_cmd': "cp %s %(builddir)s"},
 ]
 
 patches = ['OpenCV-%(version)s_with_IPP.patch']

diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-intel-2016b.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-intel-2016b.eb
@@ -19,7 +19,7 @@ source_urls = [
 
 sources = [
     '%(version)s.zip',
-    ('ippicv_linux_20151201.tgz', 'cp %s %(builddir)s'),
+    {'filename': 'ippicv_linux_20151201.tgz', 'extract_cmd': "cp %s %(builddir)s"},
 ]
 
 patches = ['OpenCV-%(version)s_with_IPP.patch']

diff --git a/easybuild/easyconfigs/p/pbbam/pbbam-20170508-intel-2017a.eb b/easybuild/easyconfigs/p/pbbam/pbbam-20170508-intel-2017a.eb
@@ -16,7 +16,7 @@ source_urls = [
     'https://github.com/google/googletest/archive/',
 ]
 sources = [
-    ('%s.tar.gz' % commit, "tar xfvz %s --strip-components=1"),  # pbbam
+    {'filename': '%s.tar.gz' % commit, 'extract_cmd': "tar xfvz %s --strip-components=1"},  # pbbam
     'release-%s.tar.gz' % gtest_ver,  # googletest
 ]
 

diff --git a/easybuild/easyconfigs/s/SURF/SURF-1.0-goolf-1.4.10-LINUXAMD64.eb b/easybuild/easyconfigs/s/SURF/SURF-1.0-goolf-1.4.10-LINUXAMD64.eb
@@ -14,7 +14,7 @@ description = "A molecular surface solver, which can be used as rendering method
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['http://www.ks.uiuc.edu/Research/vmd/extsrcs']
-sources = [('%(namelower)s.tar.Z', 'tar -xzf %s')]
+sources = [{'filename': '%(namelower)s.tar.Z', 'extract_cmd': "tar -xzf %s"}]
 
 builddependencies = [
     ('makedepend', '1.0.4'),

diff --git a/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb b/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb
@@ -14,7 +14,7 @@ description = "A molecular surface solver, which can be used as rendering method
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ['http://www.ks.uiuc.edu/Research/vmd/extsrcs']
-sources = [('%(namelower)s.tar.Z', 'tar -xzf %s')]
+sources = [{'filename': '%(namelower)s.tar.Z', 'extract_cmd': "tar -xzf %s"}]
 
 builddependencies = [
     ('makedepend', '1.0.4'),

diff --git a/easybuild/easyconfigs/v/VarScan/VarScan-2.3.6-Java-1.7.0_80.eb b/easybuild/easyconfigs/v/VarScan/VarScan-2.3.6-Java-1.7.0_80.eb
@@ -13,7 +13,7 @@ description = """Variant calling and somatic mutation/CNV detection for next-gen
 
 toolchain = {'name': 'dummy', 'version': ''}
 
-sources = [('%(name)s.v%(version)s.jar', 'download')]
+sources = ['%(name)s.v%(version)s.jar']
 source_urls = ['https://sourceforge.net/projects/varscan/files/']
 
 dependencies = [('Java', '1.7.0_80')]