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

Conversation

migueldiascosta
Copy link
Member

(created using eb --new-pr)

@boegel boegel added this to the 3.1.2 milestone Mar 8, 2017
@@ -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?

@@ -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?

@@ -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 %?

@@ -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/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')],
Copy link
Member

Choose a reason for hiding this comment

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

@migueldiascosta missing 2nd pyver

@boegel
Copy link
Member

boegel commented Mar 8, 2017

Test report by @boegel
SUCCESS
Build succeeded for 4 out of 4 (4 easyconfigs in this PR)
node2141.delcatty.os - Linux centos linux 7.3.1611, Intel(R) Xeon(R) CPU E5-2670 0 @ 2.60GHz, Python 2.7.5
See https://gist.github.com/53540a558367d73fbb8285c3d63f5800 for a full test report.

@boegel
Copy link
Member

boegel commented Mar 8, 2017

Going in, thanks @migueldiascosta!

@boegel boegel merged commit f0b0c97 into easybuilders:develop Mar 8, 2017
@migueldiascosta migueldiascosta deleted the 20170308164509_new_pr_GATK330 branch October 2, 2020 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants