Skip to content

Fix bootstrap for missing sys_platform#1490

Merged
boegel merged 6 commits intoeasybuilders:developfrom
wpoely86:bootstrap
Nov 27, 2015
Merged

Fix bootstrap for missing sys_platform#1490
boegel merged 6 commits intoeasybuilders:developfrom
wpoely86:bootstrap

Conversation

@wpoely86
Copy link
Copy Markdown
Member

This should fix #1099 and it should respect $EASYBUILD_MODULES_TOOL if set before running the bootstrap.

@boegel please review. Works for me.

Comment thread easybuild/scripts/bootstrap_eb.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this should be changed eventually, obviously :)

@hpcugentbot
Copy link
Copy Markdown

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.

@hpcugentbot
Copy link
Copy Markdown

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.

Comment thread easybuild/scripts/bootstrap_eb.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

sure, I'm not a fan either.

But please test first 😉

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Exactly as the comment already says: just a newer version of markerlib.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@wpoely86: then the patch should be tiny? please include it as a comment then

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@wpoely86: tested on different SL6 & SLES11 systems, works like a charm

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

OK, then clearly indicate which file was replaced (from which version of distribute), and where the version that was used can be found exactly

wpoely86 added a commit to wpoely86/easybuild that referenced this pull request Nov 27, 2015
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.
@wpoely86
Copy link
Copy Markdown
Member Author

@boegel should be good now

@boegel
Copy link
Copy Markdown
Member

boegel commented Nov 27, 2015

@wpoely86: retested, looks fine, will merge when Jenkins gives green light

@hpcugentbot
Copy link
Copy Markdown

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.

@boegel
Copy link
Copy Markdown
Member

boegel commented Nov 27, 2015

Going in, thanks @wpoely86!

boegel added a commit that referenced this pull request Nov 27, 2015
Fix bootstrap for missing sys_platform
@boegel boegel merged commit f1bb87d into easybuilders:develop Nov 27, 2015
@wpoely86 wpoely86 deleted the bootstrap branch November 27, 2015 14:44
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.

3 participants