don't hardcode .so, use get_shared_lib_ext instead#789
don't hardcode .so, use get_shared_lib_ext instead#789boegel merged 4 commits intoeasybuilders:developfrom
Conversation
|
Automatic reply from Jenkins: Can I test this? |
There was a problem hiding this comment.
'constants' (i.e., variables with a name in capitals) are only defined outside of classes/functions in the coding style we maintain, so please change this to:
shlib_ext = get_shared_lib_ext()|
@citibob: the proposed changes look fine, just some small remarks w.r.t. code style; maintaining a uniform coding style across the entire project really helps in lowering the bar for contributions, so please take them into account and apply the suggestions consistently I'll also trigger our bot to run the unit tests, but I don't expect any problems there (for easyblocks, it mostly checks for silly syntax errors, it doesn't retest using the easyblock itself) Don't hesitate to let us know if you have any questions! |
|
Jenkins: ok to test |
|
@citibob: I also tweaked the title of your PR, that's going to make it a lot easier to track (and for me to include it in the release notes for the next EB release) |
|
Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1542/console for more details). This pull request is now ready for review/testing. Please try and find someone who can tackle this; contact @boegel if you're not sure what to do. |
|
Thank you for the input. At this point... do I need to make the edits, or On Sat, Jan 2, 2016 at 11:17 AM, Kenneth Hoste [email protected]
|
|
@citibob: no, the changes have not been made, I just added some in-line remarks in the pull request. The easiest way to follow-up on them is to take a look at the 'diff' view on GitHub, which you can reach via the 'Files changed' tab (https://github.com/hpcugent/easybuild-easyblocks/pull/789/files). That will give you an overview of the suggestions I made, alongside the lines of code to which the suggestions apply. After making the changes, just include them in your More or less this: Don't hesitate to let us know if you have any questions! |
|
OK, should be ready now for new review. Hopefully I haven't broken More generally... I'm thinking of trying an automated search-and-replace I figure it can't hurt to try. I'll do an automated fix, submit a pull -- Elizabeth On Sat, Jan 2, 2016 at 11:46 AM, Kenneth Hoste [email protected]
|
…ased on:
grep '\.so' `find . -name '*.py'` | less
The changes have NOT been tested. Some files were not changed for the
following reasons:
atlas.py:
Spurious .so turned up by grep
cblas.py, openssl.py:
The easyblock looks for libraries like libx.so.1.1.1 --- which
translate on the Mac as libx.1.1.1.dylib. This will require a
little more effort to get right.
geant4.py:
The easyblock has a build conversation with the package. It looks
for prompts containing ".so". Without further inspection, it's
hard to know what those prompts will be like on the Mac; hence,
this file was not touched.
numpy.py:
.so was only in comments. Furthermore... it is referring to a
Python extension, which retains the same '.so' extension on Mac
and Linux.
petsc.py:
The '.so' here refers to a system-standard
'/usr/lib64/libpapi.so', rather than a shared library created by
the project. There might be other issues with this on a Mac, so
it has not been touched for now.
NOTE: The following Emacs-Lisp commands were evaluated to ease this process.
(global-set-key (kbd "C-1") "from easybuild.tools.systemtools import get_shared_lib_ext\n")
(global-set-key (kbd "C-2") " shlib_ext = get_shared_lib_ext()\n")
(global-set-key (kbd "C-3") "shlib_ext")
|
@citibob: no extra commit was pushed to the branch that corresponds with this PR? Do you have the commit ID? |
|
Sorry, git confusion. It should be there now. The latest commit is SHA 27d32de. I "fixed" (almost) all the easyblocks. -- Elizabeth On Sat, Jan 2, 2016 at 5:00 PM, Kenneth Hoste [email protected]
|
|
Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1543/console for more details). This pull request is now ready for review/testing. Please try and find someone who can tackle this; contact @boegel if you're not sure what to do. |
|
@citibob: looks great! I gave your proposed changes a thorough review, and couldn't spot any problems. A couple of style issues came to my attention though, but since most a not caused/related to your changes, I'll tackle those in a follow-up PR, rather than block this PR over it. Going in, thanks a lot for looking into this! And congratulations on your first (code) contribution to EasyBuild, hopefully one of many more to come. |
don't hardcode .so, use get_shared_lib_ext instead
bug fix in ACML easyblock and minor style fixes after #789 (1/4)
minor style fixes after #789 (2/4)
minor style fixes after #789 (4/4)
minor style fixes after #789 (3/4)
fix typo in imkl.py (introduced in #789)
Repeat of .dylib fix
(edit: same changes as in #788, but to
develop)