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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from Mar 8, 2017
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc73007
yet another batch of minor style fixes
migueldiascosta Mar 8, 2017
f2188cf
yet another style fix
migueldiascosta Mar 8, 2017
8dba00c
yet another style fix
migueldiascosta Mar 8, 2017
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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/GC3Pie/GC3Pie-2.3.eb
View file
Open in desktop
Expand Up @@ -103,7 +103,8 @@ 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))],
('lib/python%s/site-packages/%s' % (pyver, eggname),
'lib64/python%s/site-packages/%s' % (pyver, eggname))],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@migueldiascosta we usually tend to avoid checking for actual `.egg's more recently, since they could be either a file or a directory, depending on a number of things.

In addition, an import gc3pie check is already done too.

So, I'd change this to:

('lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages'),

and move it to dirs?

'dirs': [],
}

Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.0.eb
View file
Open in desktop
Expand Up @@ -103,7 +103,8 @@ 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))],
('lib/python%s/site-packages/%s' % (pyver, eggname),
'lib64/python%s/site-packages/%s' % (pyver, eggname))],
'dirs': [],
}

Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.1.eb
View file
Open in desktop
Expand Up @@ -103,7 +103,8 @@ 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))],
('lib/python%s/site-packages/%s' % (pyver, eggname),
'lib64/python%s/site-packages/%s' % (pyver, eggname))],
'dirs': [],
}

Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb
View file
Open in desktop
Expand Up @@ -103,7 +103,8 @@ 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))],
('lib/python%s/site-packages/%s' % (pyver, eggname),
'lib64/python%s/site-packages/%s' % (pyver, eggname))],
'dirs': [],
}

Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/GLib/GLib-2.48.0-foss-2016a.eb
View file
Open in desktop
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 --enable-static --enable-shared "
configopts += "--disable-systemtap"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this --disable with the others, and move the --enable-* ones to a new line instead?


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
View file
Open in desktop
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 --enable-static --enable-shared "
configopts += "--disable-systemtap"

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
View file
Open in desktop
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 --enable-static --enable-shared "
configopts += "--disable-systemtap"

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
View file
Open in desktop
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 --enable-static --enable-shared "
configopts += "--disable-systemtap"

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
View file
Open in desktop
Expand Up @@ -24,4 +24,3 @@ sanity_check_paths = {
}

moduleclass = 'math'

4 changes: 2 additions & 2 deletions easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.06-mpi.eb
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.11-mpi.eb
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayIntel-2015.11-mpi.eb
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.2-goolf-1.7.20-mt.eb
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.19-intel-2016a.eb
View file
Open in desktop
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/%s/" % source_subdir]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do + rather than %?

sources = ["ghostpdl-%(version)s.tar.bz2"]

dependencies = [
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.19-intel-2016b.eb
View file
Open in desktop
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/%s/" % 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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/g/gensim/gensim-0.13.2-foss-2016a-Python-2.7.11.eb
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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'
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb
View file
Open in desktop
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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep the .a and this entry together on the same line?

'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