Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

yet another batch of minor style fixes (g) #4275

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.7.0_21.eb
Expand Up @@ -2,7 +2,8 @@
# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
#
# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>,
# Kenneth Hoste (UGent)
# License:: MIT/GPL
# $Id$
#
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.7.0_80.eb
Expand Up @@ -2,7 +2,8 @@
# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
#
# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>,
# Kenneth Hoste (UGent)
# License:: MIT/GPL
# $Id$
#
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.8.0_66.eb
Expand Up @@ -2,7 +2,8 @@
# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
#
# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>,
# Kenneth Hoste (UGent)
# License:: MIT/GPL
# $Id$
#
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_66.eb
Expand Up @@ -2,7 +2,8 @@
# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
#
# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>,
# Kenneth Hoste (UGent)
# License:: MIT/GPL
# $Id$
#
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_74.eb
Expand Up @@ -2,7 +2,8 @@
# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
#
# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>,
# Kenneth Hoste (UGent)
# License:: MIT/GPL
# $Id$
#
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GATK/GATK-3.6-Java-1.8.0_92.eb
Expand Up @@ -2,7 +2,8 @@
# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
#
# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>,
# Kenneth Hoste (UGent)
# License:: MIT/GPL
# $Id$
#
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GATK/GATK-3.7-Java-1.8.0_112.eb
Expand Up @@ -2,7 +2,8 @@
# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
#
# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>,
# Kenneth Hoste (UGent)
# License:: MIT/GPL
# $Id$
#
Expand Down
6 changes: 2 additions & 4 deletions easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.3.eb
Expand Up @@ -100,11 +100,9 @@ modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyver, 'lib64/pyt
# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
full_sanity_check = True

eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
sanity_check_paths = {
'files': ['bin/gc3utils',
('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
'dirs': [],
'files': ['bin/gc3utils'],
'dirs': [('lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver)],
}

sanity_check_commands = [('gc3utils', 'info --version')]
Expand Down
6 changes: 2 additions & 4 deletions easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.0.eb
Expand Up @@ -100,11 +100,9 @@ modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyver, 'lib64/pyt
# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
full_sanity_check = True

eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
sanity_check_paths = {
'files': ['bin/gc3utils',
('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
'dirs': [],
'files': ['bin/gc3utils'],
'dirs': [('lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver)],
}

sanity_check_commands = [('gc3utils', 'info --version')]
Expand Down
6 changes: 2 additions & 4 deletions easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.1.eb
Expand Up @@ -100,11 +100,9 @@ modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyver, 'lib64/pyt
# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
full_sanity_check = True

eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
sanity_check_paths = {
'files': ['bin/gc3utils',
('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
'dirs': [],
'files': ['bin/gc3utils'],
'dirs': [('lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver)],
}

sanity_check_commands = [('gc3utils', 'info --version')]
Expand Down
6 changes: 2 additions & 4 deletions easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb
Expand Up @@ -100,11 +100,9 @@ modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyver, 'lib64/pyt
# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
full_sanity_check = True

eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
sanity_check_paths = {
'files': ['bin/gc3utils',
('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
'dirs': [],
'files': ['bin/gc3utils'],
'dirs': [('lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver)],
}

sanity_check_commands = [('gc3utils', 'info --version')]
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GLib/GLib-2.48.0-foss-2016a.eb
Expand Up @@ -21,7 +21,8 @@ dependencies = [

builddependencies = [('Python', '2.7.11')]

configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared --disable-systemtap"
configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --disable-systemtap "
configopts += "--enable-static --enable-shared"

postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]

Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GLib/GLib-2.48.0-intel-2016a.eb
Expand Up @@ -21,7 +21,8 @@ dependencies = [

builddependencies = [('Python', '2.7.11')]

configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared --disable-systemtap"
configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --disable-systemtap "
configopts += "--enable-static --enable-shared"

postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]

Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GLib/GLib-2.49.5-foss-2016b.eb
Expand Up @@ -21,7 +21,8 @@ dependencies = [

builddependencies = [('Python', '2.7.12')]

configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared --disable-systemtap"
configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --disable-systemtap "
configopts += "--enable-static --enable-shared"

postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]

Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GLib/GLib-2.49.5-intel-2016b.eb
Expand Up @@ -21,7 +21,8 @@ dependencies = [

builddependencies = [('Python', '2.7.12')]

configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared --disable-systemtap"
configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --disable-systemtap "
configopts += "--enable-static --enable-shared"

postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]

Expand Down
1 change: 0 additions & 1 deletion easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015b.eb
Expand Up @@ -24,4 +24,3 @@ sanity_check_paths = {
}

moduleclass = 'math'

Expand Up @@ -31,11 +31,11 @@ sources = [
'regressiontests-%(version)s.tar.gz',
]

preconfigopts = "export CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH:${EBROOTFFTW}/lib && "
preconfigopts = "export CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH:${EBROOTFFTW}/lib && "
preconfigopts += "export CMAKE_INCLUDE_PATH=$CMAKE_INCLUDE_PATH:${EBROOTFFTW}/include && "

dependencies = [
('fftw/3.3.4.3', EXTERNAL_MODULE),
('fftw/3.3.4.3', EXTERNAL_MODULE),
]

builddependencies = [('CMake', '3.2.2')]
Expand Down
Expand Up @@ -31,11 +31,11 @@ sources = [
'regressiontests-%(version)s.tar.gz',
]

preconfigopts = "export CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH:$EBROOTFFTW/lib && "
preconfigopts = "export CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH:$EBROOTFFTW/lib && "
preconfigopts += "export CMAKE_INCLUDE_PATH=$CMAKE_INCLUDE_PATH:$EBROOTFFTW/include && "

dependencies = [
('fftw/3.3.4.5', EXTERNAL_MODULE),
('fftw/3.3.4.5', EXTERNAL_MODULE),
]

builddependencies = [('CMake', '3.2.2')]
Expand Down
Expand Up @@ -31,11 +31,11 @@ sources = [
'regressiontests-%(version)s.tar.gz',
]

preconfigopts = "export CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH:$EBROOTFFTW/lib && "
preconfigopts = "export CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH:$EBROOTFFTW/lib && "
preconfigopts += "export CMAKE_INCLUDE_PATH=$CMAKE_INCLUDE_PATH:$EBROOTFFTW/include && "

dependencies = [
('fftw/3.3.4.5', EXTERNAL_MODULE),
('fftw/3.3.4.5', EXTERNAL_MODULE),
]

builddependencies = [('CMake', '3.2.2')]
Expand Down
Expand Up @@ -28,8 +28,8 @@ source_urls = [

sources = [
SOURCELOWER_TAR_GZ,
# seems to have disappeared?
# 'regressiontests-5.0.2.tar.gz',
# seems to have disappeared?
# 'regressiontests-5.0.2.tar.gz',
]

builddependencies = [
Expand Down
Expand Up @@ -10,7 +10,8 @@ description = """Ghostscript is a versatile processor for PostScript data with t
toolchain = {'name': 'intel', 'version': '2016a'}
toolchainopts = {'pic': True}

source_urls = ["https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%(version_major)s%(version_minor)s/"]
source_subdir = 'gs%(version_major)s%(version_minor)s'
source_urls = ["https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/" + source_subdir]
sources = ["ghostpdl-%(version)s.tar.bz2"]

dependencies = [
Expand Down
Expand Up @@ -10,7 +10,8 @@ description = """Ghostscript is a versatile processor for PostScript data with t
toolchain = {'name': 'intel', 'version': '2016b'}
toolchainopts = {'pic': True}

source_urls = ["https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%(version_major)s%(version_minor)s/"]
source_subdir = 'gs%(version_major)s%(version_minor)s'
source_urls = ["https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/" + source_subdir]
sources = ["ghostpdl-%(version)s.tar.bz2"]

dependencies = [
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/Grep/Grep-2.21-GCC-4.9.2.eb
Expand Up @@ -4,7 +4,8 @@ name = 'Grep'
version = '2.21'

homepage = 'http://www.gnu.org/software/grep/'
description = """The grep command searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines."""
description = """The grep command searches one or more input files for lines containing a match to a specified pattern.
By default, grep prints the matching lines."""

toolchain = {'name': 'GCC', 'version': '4.9.2'}

Expand Down
Expand Up @@ -46,4 +46,4 @@ sanity_check_paths = {

modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}

moduleclass = 'lib'
moduleclass = 'lib'
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/g/git-lfs/git-lfs-1.1.1.eb
Expand Up @@ -25,8 +25,8 @@ sanity_check_paths = {

# add the installation dir to PATH
modextrapaths = {
'PATH': '',
}
'PATH': '',
}

# remove exec permission for the provided installation script
postinstallcmds = ["chmod og-x %(installdir)s/install.sh"]
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/g/gompi/gompi-2016.07.eb
Expand Up @@ -15,8 +15,8 @@ gccbinver = '%s-%s' % (gccver, binutilsver)

# compiler toolchain dependencies
dependencies = [
('GCC', gccbinver), # includes both GCC and binutils
('OpenMPI', '1.10.3', '', ('GCC', gccbinver)),
('GCC', gccbinver), # includes both GCC and binutils
('OpenMPI', '1.10.3', '', ('GCC', gccbinver)),
]

moduleclass = 'toolchain'
Expand Up @@ -21,7 +21,8 @@ dependencies = [
]

sanity_check_paths = {
'files': ['lib/gtkglext-1.0/include/gdkglext-config.h', 'lib/libgdkglext-x11-1.0.a', 'lib/libgdkglext-x11-1.0.%s' % SHLIB_EXT,
'files': ['lib/gtkglext-1.0/include/gdkglext-config.h',
'lib/libgdkglext-x11-1.0.a', 'lib/libgdkglext-x11-1.0.%s' % SHLIB_EXT,
'lib/libgtkglext-x11-1.0.a', 'lib/libgtkglext-x11-1.0.%s' % SHLIB_EXT],
'dirs': ['include/gtkglext-1.0/gdk', 'include/gtkglext-1.0/gtk', 'lib/pkgconfig'],
}
Expand Down