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

Updated numpy easyblock to use read_file for patch. #2395

Merged
merged 1 commit into from Apr 27, 2021

Conversation

dithwick
Copy link
Contributor

This fixes issue #2393 (for numpy.py only).

@@ -142,7 +142,7 @@ def get_libs_for_mkl(varname):
# patches are either strings (extension) or dicts (easyblock)
if isinstance(patch, dict):
patch = patch['path']
if patch_wl_regex.search(open(patch, 'r').read()):
if patch_wl_regex.search(read_file(patch)):
Copy link
Contributor

@smoors smoors Apr 26, 2021

Choose a reason for hiding this comment

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

(sorry that was a stupid comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

@dithwick can you create a test report that includes this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep will do!

@dithwick
Copy link
Contributor Author

Test report by @dithwick

Overview of tested easyconfigs (in order)

  • SUCCESS SciPy-bundle-2020.11-intel-2020b.eb

Build succeeded for 1 out of 1 (1 easyconfigs in total)
moorcroft.scrtp.warwick.ac.uk - Linux centos linux 7.9.2009, x86_64, Intel(R) Core(TM) i5-8600 CPU @ 3.10GHz, Python 2.7.5
See https://gist.github.com/7d3643dd0a71a8a7640799e63c28cfef for a full test report.

@smoors smoors added the bug fix label Apr 27, 2021
@smoors smoors added this to the next release (4.3.5?) milestone Apr 27, 2021
Copy link
Contributor

@smoors smoors left a comment

Choose a reason for hiding this comment

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

lgtm

@smoors
Copy link
Contributor

smoors commented Apr 27, 2021

Going in, thanks @dithwick!

@smoors smoors merged commit 5b8a5b9 into easybuilders:develop Apr 27, 2021
@dithwick dithwick deleted the 20210426_numpy_read_file_fix branch April 27, 2021 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants