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
resolve loader_path #100
resolve loader_path #100
Conversation
How did We need some tests... Does the Numpy wheel work once this patch is applied? |
It didn't get into the numpy wheels. It's in
It should. I haven't checked it.
I've no idea how to write a test. Any suggestions? |
Aha - I don't we had previously seen For the tests - I'm afraid it's a little bit fiddly. But you could do a first pass by extending the tests in |
Nice - thanks. Just to do the final sign-off - would you mind checking if the Numpy wheels work with this fix? |
It seems like we are running this function after copying |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First pass thoughts. I need to reflect a bit on the new argument.
@@ -141,6 +141,11 @@ def test_add_rpath(): | |||
assert_equal(get_rpaths(libfoo), ('/a/path',)) | |||
add_rpath(libfoo, '/another/path') | |||
assert_equal(get_rpaths(libfoo), ('/a/path', '/another/path')) | |||
add_rpath(libfoo, '@loader_path') | |||
assert_equal(get_rpaths(libfoo), ('/a/path', '/another/path', tmpdir)) | |||
add_rpath(libfoo, '@loader_path/lib') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this now testing the original path manipulation?
@@ -56,7 +58,16 @@ def tree_libs(start_path, filt_func=None): | |||
depending_libpath = realpath(pjoin(dirpath, base)) | |||
if filt_func is not None and not filt_func(depending_libpath): | |||
continue | |||
rpaths = get_rpaths(depending_libpath) | |||
|
|||
depending_libpath_orig = depending_libpath |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comments would help here.
Ping on this |
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
@@ -180,6 +180,9 @@ def _cmd_out_err(cmd): | |||
return out.split('\n') | |||
|
|||
|
|||
_LINE0_RE = re.compile(r"^(?: \(architecture .*\))?:(?P<further_report>.*)") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would you mind splitting these changes off into a separate PR, after #94 is merged? Maybe add a comment above this line explaining the "architecture" string?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure. I'll send a PR after #94 is merged.
Yes |
No description provided.