Fix bootstrap for missing sys_platform #1490
Conversation
| @@ -224,6 +236,8 @@ def stage0(tmpdir): | |||
| from distribute_setup import main as distribute_setup_main | |||
| orig_sys_argv = sys.argv[:] # make a copy | |||
| sys.argv.append('--prefix=%s' % tmpdir) | |||
| # url should become: http://raw.githubusercontent.com/hpcugent/easybuild-framework/master/easybuild/scripts/ | |||
| sys.argv.append('--download-base=http://users.ugent.be/~wpoelman/') | |||
There was a problem hiding this comment.
this should be changed eventually, obviously :)
|
EasyBuild framework unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-framework-pr-builder/2371/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. |
|
EasyBuild framework unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-framework-pr-builder/2373/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. |
| @@ -224,6 +236,9 @@ def stage0(tmpdir): | |||
| from distribute_setup import main as distribute_setup_main | |||
| orig_sys_argv = sys.argv[:] # make a copy | |||
| sys.argv.append('--prefix=%s' % tmpdir) | |||
| # We download a custom version of distribute: it uses a newer version of markerlib to avoid a bug (#1099) | |||
| # url should become: http://raw.githubusercontent.com/hpcugent/easybuild-framework/master/easybuild/scripts/ | |||
| sys.argv.append('--download-base=http://users.ugent.be/~wpoelman/') | |||
There was a problem hiding this comment.
@wpoely86: maybe we should upload the tarball at http://hpcugent.github.io/easybuild/files instead? Not a big fan of pushing a tarball into the framework git repo...
There was a problem hiding this comment.
sure, I'm not a fan either.
But please test first 😉
There was a problem hiding this comment.
can you also clarify things a bit in which way the distribute we download here is 'custom'? how was it patched compared to the upstream version?
There was a problem hiding this comment.
Exactly as the comment already says: just a newer version of markerlib.
There was a problem hiding this comment.
@wpoely86: then the patch should be tiny? please include it as a comment then
There was a problem hiding this comment.
@wpoely86: tested on different SL6 & SLES11 systems, works like a charm
There was a problem hiding this comment.
It's not tiny. It's one file replaced by another. I can add that the file can be found at https://pypi.python.org/pypi/markerlib/0.6.0
There was a problem hiding this comment.
OK, then clearly indicate which file was replaced (from which version of distribute), and where the version that was used can be found exactly
The PR for which this is need can be found at easybuilders/easybuild-framework#1490 This is the source of distribute 0.6.49 with the file `_markerlib/markers.py` replaced by the 0.6 version of markerlib which can be found at https://pypi.python.org/pypi/markerlib/0.6.0
If user specifies $EASYBUILD_MODULES_TOOL, we should use it in the bootstrap.
Use a custom version for distribute and change url to easybuild url.
|
@boegel should be good now |
|
@wpoely86: retested, looks fine, will merge when Jenkins gives green light |
|
EasyBuild framework unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-framework-pr-builder/2386/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. |
|
Going in, thanks @wpoely86! |
Fix bootstrap for missing sys_platform
This should fix #1099 and it should respect
$EASYBUILD_MODULES_TOOLif set before running the bootstrap.@boegel please review. Works for me.