Merge branch 'kivy:develop' into firebase

Author: kengoon

.github/workflows/docker.yml

@@ -0,0 +1,24 @@
+name: Docker
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - develop
+  pull_request:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+      - run: make docker/build
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: docker push
+        if: github.ref == 'develop'
+        run: |
+          make docker/login
+          make docker/push

Makefile

@@ -117,6 +117,9 @@ docker/pull:
 docker/build:
 	docker build --cache-from=$(DOCKER_IMAGE) --tag=$(DOCKER_IMAGE) .
 
+docker/login:
+	@echo $(DOCKERHUB_TOKEN) | docker login --username $(DOCKERHUB_USERNAME) --password-stdin
+
 docker/push:
 	docker push $(DOCKER_IMAGE)
 

README.md

@@ -47,6 +47,7 @@ python-for-android is not limited to being used with Buildozer.
 
 [![Unit tests & build apps](https://github.com/kivy/python-for-android/workflows/Unit%20tests%20&%20build%20apps/badge.svg?branch=develop)](https://github.com/kivy/python-for-android/actions?query=workflow%3A%22Unit+tests+%26+build+apps%22)
 [![Coverage Status](https://coveralls.io/repos/github/kivy/python-for-android/badge.svg?branch=develop&kill_cache=1)](https://coveralls.io/github/kivy/python-for-android?branch=develop)
+[![Docker](https://github.com/kivy/python-for-android/actions/workflows/docker.yml/badge.svg)](https://github.com/kivy/python-for-android/actions/workflows/docker.yml)
 
 ## Documentation
 

ci/rebuild_updated_recipes.py

@@ -39,7 +39,7 @@ def modified_recipes(branch='origin/develop'):
     # using the contrib version on purpose rather than sh.git, since it comes
     # with a bunch of fixes, e.g. disabled TTY, see:
     # https://stackoverflow.com/a/20128598/185510
-    git_diff = sh.contrib.git.diff('--name-only', branch)
+    git_diff = sh.contrib.git.diff('--name-only', branch).split("\n")
     recipes = set()
     for file_path in git_diff:
         if 'pythonforandroid/recipes/' in file_path:

pythonforandroid/build.py

@@ -29,14 +29,14 @@
 def get_targets(sdk_dir):
     if exists(join(sdk_dir, 'cmdline-tools', 'latest', 'bin', 'avdmanager')):
         avdmanager = sh.Command(join(sdk_dir, 'cmdline-tools', 'latest', 'bin', 'avdmanager'))
-        targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')
+        targets = avdmanager('list', 'target').split('\n')
 
     elif exists(join(sdk_dir, 'tools', 'bin', 'avdmanager')):
         avdmanager = sh.Command(join(sdk_dir, 'tools', 'bin', 'avdmanager'))
-        targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')
+        targets = avdmanager('list', 'target').split('\n')
     elif exists(join(sdk_dir, 'tools', 'android')):
         android = sh.Command(join(sdk_dir, 'tools', 'android'))
-        targets = android('list').stdout.decode('utf-8').split('\n')
+        targets = android('list').split('\n')
     else:
         raise BuildInterruptingException(
             'Could not find `android` or `sdkmanager` binaries in Android SDK',

pythonforandroid/recipe.py

@@ -12,8 +12,6 @@
 from urllib.request import urlretrieve
 from os import listdir, unlink, environ, curdir, walk
 from sys import stdout
-from wheel.wheelfile import WheelFile
-from wheel.cli.tags import tags as wheel_tags
 import time
 try:
     from urlparse import urlparse
@@ -26,7 +24,7 @@
     logger, info, warning, debug, shprint, info_main, error)
 from pythonforandroid.util import (
     current_directory, ensure_dir, BuildInterruptingException, rmdir, move,
-    touch)
+    touch, patch_wheel_setuptools_logging)
 from pythonforandroid.util import load_source as import_recipe
 
 
@@ -469,8 +467,7 @@ def unpack(self, arch):
                     elif extraction_filename.endswith(
                             ('.tar.gz', '.tgz', '.tar.bz2', '.tbz2', '.tar.xz', '.txz')):
                         sh.tar('xf', extraction_filename)
-                        root_directory = sh.tar('tf', extraction_filename).stdout.decode(
-                                'utf-8').split('\n')[0].split('/')[0]
+                        root_directory = sh.tar('tf', extraction_filename).split('\n')[0].split('/')[0]
                         if root_directory != basename(directory_name):
                             move(root_directory, directory_name)
                     else:
@@ -1205,6 +1202,9 @@ def get_wheel_platform_tag(self, arch):
         }[arch.arch]
 
     def install_wheel(self, arch, built_wheels):
+        with patch_wheel_setuptools_logging():
+            from wheel.cli.tags import tags as wheel_tags
+            from wheel.wheelfile import WheelFile
         _wheel = built_wheels[0]
         built_wheel_dir = dirname(_wheel)
         # Fix wheel platform tag

pythonforandroid/recipes/python3/__init__.py

@@ -320,7 +320,7 @@ def build_arch(self, arch):
 
         android_build = sh.Command(
             join(recipe_build_dir,
-                 'config.guess'))().stdout.strip().decode('utf-8')
+                 'config.guess'))().strip()
 
         with current_directory(build_dir):
             if not exists('config.status'):

pythonforandroid/recipes/tiktoken/__init__.py

@@ -0,0 +1,12 @@
+from pythonforandroid.recipe import RustCompiledComponentsRecipe
+
+
+class TiktokenRecipe(RustCompiledComponentsRecipe):
+    name = 'tiktoken'
+    version = '0.7.0'
+    url = 'https://github.com/openai/tiktoken/archive/refs/tags/{version}.tar.gz'
+    sha512sum = "bb2d8fd5acd660d60e690769e46cf29b06361343ea30e35613d27d55f44acf9834e51aef28f4ff316ef66f2130042079718cea04b2353301aef334cd7bd6d221"
+    depends = ['regex', 'requests']
+
+
+recipe = TiktokenRecipe()

pythonforandroid/util.py

@@ -1,4 +1,5 @@
 import contextlib
+from unittest import mock
 from fnmatch import fnmatch
 import logging
 from os.path import exists, join
@@ -163,3 +164,16 @@ def max_build_tool_version(
     """
 
     return max(build_tools_versions, key=build_tools_version_sort_key)
+
+
+def patch_wheel_setuptools_logging():
+    """
+    When setuptools is not present and the root logger has no handlers,
+    Wheels would configure the root logger with DEBUG level, refs:
+    - https://github.com/pypa/wheel/blob/0.44.0/src/wheel/util.py
+    - https://github.com/pypa/wheel/blob/0.44.0/src/wheel/_setuptools_logging.py
+
+    Both of these conditions are met in our CI, leading to very verbose
+    and unreadable `sh` logs. Patching it prevents that.
+    """
+    return mock.patch("wheel._setuptools_logging.configure")

setup.py

@@ -21,7 +21,7 @@
 # https://github.com/kivy/buildozer/issues/722
 install_reqs = [
     'appdirs', 'colorama>=0.3.3', 'jinja2',
-    'sh>=1.10, <2.0; sys_platform!="win32"',
+    'sh>=2, <3.0; sys_platform!="win32"',
     'build', 'toml', 'packaging', 'setuptools', 'wheel~=0.43.0'
 ]
 # (build and toml are used by pythonpackage.py)