From 4c1ec6dbc2b0023f868fc16e9cd8c0d87d032897 Mon Sep 17 00:00:00 2001 From: Andre Miras Date: Thu, 7 Mar 2024 12:21:35 +0100 Subject: [PATCH] :loud_sound: Improve rebuild recipes logging Add the build command to the logs so it's more clear how to reproduce a potential rebuild issue. Bump pyzbar recipe to trigger a demo rebuild. --- ci/rebuild_updated_recipes.py | 14 +++++++++----- pythonforandroid/recipes/pyzbar/__init__.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ci/rebuild_updated_recipes.py b/ci/rebuild_updated_recipes.py index 3a693a453d..a1ca96681d 100755 --- a/ci/rebuild_updated_recipes.py +++ b/ci/rebuild_updated_recipes.py @@ -59,14 +59,18 @@ def build(target_python, requirements, archs): requirements.add(target_python.name) requirements = ','.join(requirements) logger.info('requirements: {}'.format(requirements)) + build_command = [ + 'setup.py', 'apk', + '--sdk-dir', android_sdk_home, + '--ndk-dir', android_ndk_home, + '--requirements', requirements + ] + [f"--arch={arch}" for arch in archs] + build_command_str = " ".join(build_command) + logger.info(f"Build command: {build_command_str}") with current_directory('testapps/on_device_unit_tests/'): # iterates to stream the output - for line in sh.python( - 'setup.py', 'apk', '--sdk-dir', android_sdk_home, - '--ndk-dir', android_ndk_home, '--requirements', - requirements, *[f"--arch={arch}" for arch in archs], - _err_to_out=True, _iter=True): + for line in sh.python(*build_command, _err_to_out=True, _iter=True): print(line) diff --git a/pythonforandroid/recipes/pyzbar/__init__.py b/pythonforandroid/recipes/pyzbar/__init__.py index cf78a558cd..5cd55d5096 100644 --- a/pythonforandroid/recipes/pyzbar/__init__.py +++ b/pythonforandroid/recipes/pyzbar/__init__.py @@ -4,7 +4,7 @@ class PyZBarRecipe(PythonRecipe): - version = '0.1.7' + version = '0.1.9' url = 'https://github.com/NaturalHistoryMuseum/pyzbar/archive/v{version}.tar.gz' # noqa