Add missing arch to version code generator. #1733
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
inclement
reviewed
Feb 26, 2019
| @@ -364,7 +364,7 @@ def make_package(args): | |||
| with open(join(dirname(__file__), 'dist_info.json'), 'r') as dist_info: | |||
| dist_data = json.load(dist_info) | |||
| arch = dist_data["archs"][0] | |||
| arch_dict = {"arm64-v8a": "8", "armeabi-v7a": "7", "x86": "6"} | |||
| arch_dict = {"x86_64": "9", "arm64-v8a": "8", "armeabi-v7a": "7", "x86": "6"} | |||
| arch_code = arch_dict[arch] | |||
There was a problem hiding this comment.
Would you mind changing this line to arch_code = arch_dict.get(arch, '5'), just to avoid issues if the user's arch is not known?
There was a problem hiding this comment.
well spotted. maybe even default to "1" which gives more space for any other unforeseen reworks?
default for unknown archs in version code
inclement
approved these changes
Feb 26, 2019
|
Thanks! |
|
Did we break the build? |
AndreMiras
reviewed
Feb 26, 2019
| arch_dict = {"arm64-v8a": "8", "armeabi-v7a": "7", "x86": "6"} | ||
| arch_code = arch_dict[arch] | ||
| arch_dict = {"x86_64": "9", "arm64-v8a": "8", "armeabi-v7a": "7", "x86": "6"} | ||
| arch_code = arch_dict.get[arch, '1'] |
There was a problem hiding this comment.
Should be get() not get[]:
Traceback (most recent call last):
File "setup_testapp_python3_sqlite_openssl.py", line 22, in <module>
package_data={'testapp_sqlite_openssl': ['*.py', '*.png']}
File "/usr/lib/python3.6/distutils/core.py", line 148, in setup
dist.run_commands()
File "/usr/lib/python3.6/distutils/dist.py", line 955, in run_commands
self.run_command(cmd)
File "/usr/lib/python3.6/distutils/dist.py", line 974, in run_command
cmd_obj.run()
File "/home/user/pythonforandroid/bdistapk.py", line 80, in run
main()
File "/home/user/pythonforandroid/toolchain.py", line 1075, in main
ToolchainCL()
File "/home/user/pythonforandroid/toolchain.py", line 577, in __init__
getattr(self, args.subparser_name.replace('-', '_'))(args)
File "/home/user/pythonforandroid/toolchain.py", line 152, in wrapper_func
func(self, args)
File "/home/user/pythonforandroid/toolchain.py", line 839, in apk
build_args = build.parse_args(args.unknown_args)
File "/home/user/.local/share/python-for-android/dists/bdisttest_python3_sqlite_openssl_googlendk/build.py", line 796, in parse_args
make_package(args)
File "/home/user/.local/share/python-for-android/dists/bdisttest_python3_sqlite_openssl_googlendk/build.py", line 368, in make_package
arch_code = arch_dict.get[arch, '1']
TypeError: 'builtin_function_or_method' object is not subscriptable
AndreMiras
added a commit
to AndreMiras/python-for-android
that referenced
this pull request
Feb 26, 2019
AndreMiras
added a commit
that referenced
this pull request
Feb 27, 2019
…_subscriptable Fixes object is not subscriptable error, refs #1733
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.
x86_64 missing from version code generator.