Deprecate and replace calls to back_tick. #126
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The non-specific timeout check has been removed. It was that or provide a specific timeout time. All internal functions and tests now use subprocess.run. Relevant tests have been cleaned up. Relevant functions have had type annotations added/updated.
Codecov Report
@@ Coverage Diff @@
## master #126 +/- ##
==========================================
+ Coverage 94.89% 95.07% +0.18%
==========================================
Files 13 13
Lines 999 995 -4
==========================================
- Hits 948 946 -2
+ Misses 51 49 -2
Continue to review full report at Codecov.
|
| @@ -278,15 +297,20 @@ def set_install_name(filename, oldname, newname, ad_hoc_sign=True): | |||
| if oldname not in names: | |||
| raise InstallNameError('{0} not in install names for {1}'.format( | |||
| oldname, filename)) | |||
| back_tick(['install_name_tool', '-change', oldname, newname, filename]) | |||
| subprocess.run( | |||
There was a problem hiding this comment.
Isn't this just subprocess.check_call?
| @@ -304,7 +328,12 @@ def set_install_id(filename, install_id, ad_hoc_sign=True): | |||
| """ | |||
| if get_install_id(filename) is None: | |||
| raise InstallNameError('{0} has no install id'.format(filename)) | |||
| back_tick(['install_name_tool', '-id', install_id, filename]) | |||
| subprocess.run( | |||
There was a problem hiding this comment.
subprocess.check_call again?
| @@ -385,12 +414,17 @@ def add_rpath(filename, newpath, ad_hoc_sign=True): | |||
| ad_hoc_sign : {True, False}, optional | |||
| If True, sign file with ad-hoc signature | |||
| """ | |||
| back_tick(['install_name_tool', '-add_rpath', newpath, filename]) | |||
| subprocess.run( | |||
| @@ -402,7 +436,12 @@ def zip2dir(zip_fname, out_dir): | |||
| """ | |||
| # Use unzip command rather than zipfile module to preserve permissions | |||
| # http://bugs.python.org/issue15795 | |||
| back_tick(['unzip', '-o', '-d', out_dir, zip_fname]) | |||
| subprocess.run( | |||
| @@ -506,8 +545,15 @@ def get_archs(libname): | |||
| if not exists(libname): | |||
| raise RuntimeError(libname + " is not a file") | |||
| try: | |||
| stdout = back_tick(['lipo', '-info', libname]) | |||
| except RuntimeError: | |||
| lipo = subprocess.run( | |||
| in_fname1, in_fname2, | ||
| '-output', out_fname]) | ||
| try: | ||
| lipo = subprocess.run( |
| @@ -565,11 +624,15 @@ def replace_signature(filename, identity): | |||
| identity : str | |||
| The signing identity to use. | |||
| """ | |||
| back_tick(['codesign', '--force', '--sign', identity, filename], | |||
| raise_err=True) | |||
| subprocess.run( | |||
| out, err = back_tick(['codesign', '--verify', filename], | ||
| ret_err=True, as_str=True, raise_err=False) | ||
| if not err: | ||
| codesign = subprocess.run( |
See https://docs.python.org/3/library/subprocess.html, it seems since Python 3.5 the official recommendation is to use
|
|
OK - all good then. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to #125
The non-specific timeout check in
back_tickhas been removed. It was that or provide a specific timeout time.All internal functions and tests now use
subprocess.run. This might change some of the exceptions raised by those functions except forlipo_fusewhich was specifically tested to raiseRuntimeError.Relevant tests have been cleaned up.
Relevant functions have had type annotations added/updated.
Ready to merge after review.