Merge branch 'develop' into less-output-during-boot

Author: kuzeyron

.github/workflows/push.yml

@@ -19,9 +19,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Set up Python 3.x
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Run flake8
@@ -35,16 +35,18 @@ jobs:
     needs: flake8
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
-        os: [ubuntu-latest, macOs-latest]
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
+        os: [ubuntu-latest, macos-latest]
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Tox tests
       run: |
         python -m pip install --upgrade pip
@@ -78,7 +80,7 @@ jobs:
             target: testapps-qt
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Build python-for-android docker image
       run: |
         docker build --tag=kivy/python-for-android .
@@ -114,9 +116,9 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        # macos-latest (ATM macos-14) runs on Apple Silicon,
-        # macos-13 runs on Intel
-        runs_on: ['macos-latest', 'macos-13']
+        # macos-latest (ATM macos-15) runs on Apple Silicon,
+        # macos-15-intel runs on Intel
+        runs_on: ['macos-latest', 'macos-15-intel']
         bootstrap:
           - name: sdl2
             target: testapps-with-numpy
@@ -129,14 +131,14 @@ jobs:
       ANDROID_NDK_HOME: ${HOME}/.android/android-ndk
     steps:
       - name: Checkout python-for-android
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up Python 3.x
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Install python-for-android
         run: |
-          python3 -m pip install -e .
+          python3 -m pip install --editable .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
           python3 pythonforandroid/prerequisites.py
@@ -162,6 +164,26 @@ jobs:
           name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-artifacts
           path: dist
 
+  test_on_emulator:
+    name: Run App on Emulator
+    needs: ubuntu_build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v5
+      - name: Download Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: ubuntu-latest-sdl2-artifacts
+          path: dist/
+
+      - name: Setup and start Android Emulator
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 30
+          arch: x86_64
+          script: ci/run_emulator_tests.sh
+
   ubuntu_rebuild_updated_recipes:
     name: Test updated recipes for arch ${{ matrix.android_arch }} [ ubuntu-latest ]
     needs: [flake8]
@@ -174,7 +196,7 @@ jobs:
       REBUILD_UPDATED_RECIPES_EXTRA_ARGS: --arch=${{ matrix.android_arch }}
     steps:
     - name: Checkout python-for-android (all-history)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
     # helps with GitHub runner getting out of space
@@ -201,9 +223,9 @@ jobs:
     strategy:
       matrix:
         android_arch: ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
-        # macos-latest (ATM macos-14) runs on Apple Silicon,
-        # macos-13 runs on Intel
-        runs_on: ['macos-latest', 'macos-13']
+        # macos-latest (ATM macos-15) runs on Apple Silicon,
+        # macos-15-intel runs on Intel
+        runs_on: ['macos-latest', 'macos-15-intel']
     env:
       ANDROID_HOME: ${HOME}/.android
       ANDROID_SDK_ROOT: ${HOME}/.android/android-sdk
@@ -212,16 +234,16 @@ jobs:
       REBUILD_UPDATED_RECIPES_EXTRA_ARGS: --arch=${{ matrix.android_arch }}
     steps:
       - name: Checkout python-for-android (all-history)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up Python 3.x
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Install python-for-android
         run: |
-          python3 -m pip install -e .
+          python3 -m pip install --editable .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
           python3 pythonforandroid/prerequisites.py
@@ -244,7 +266,7 @@ jobs:
   documentation:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Requirements
       run: |
         python -m pip install --upgrade pip

.github/workflows/pypi-release.yml

@@ -19,7 +19,7 @@ jobs:
         twine check dist/*
     - name: Publish package
       if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@v1.4.2
+      uses: pypa/gh-action-pypi-publish@v1.13.0
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}

ci/run_emulator_tests.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+set -euxo pipefail
+
+# Find the built APK file
+APK_FILE=$(find dist -name "*.apk" -print -quit)
+
+if [ -z "$APK_FILE" ]; then
+    echo "Error: No APK file found in dist/"
+    exit 1
+fi
+
+echo "Installing $APK_FILE..."
+adb install "$APK_FILE"
+
+# Extract package and activity names
+AAPT2_PATH=$(find ${ANDROID_HOME}/build-tools/ -name aapt2 | sort -r | head -n 1)
+APP_PACKAGE=$(${AAPT2_PATH} dump badging "${APK_FILE}" | awk -F"'" '/package: name=/{print $2}')
+APP_ACTIVITY=$(${AAPT2_PATH} dump badging "${APK_FILE}" | awk -F"'" '/launchable-activity/ {print $2}')
+
+echo "Launching $APP_PACKAGE/$APP_ACTIVITY..."
+adb shell am start -n "$APP_PACKAGE/$APP_ACTIVITY" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
+
+# Poll for test completion with timeout
+MAX_WAIT=300
+POLL_INTERVAL=5
+elapsed=0
+
+echo "Waiting for tests to complete (max ${MAX_WAIT}s)..."
+
+while [ $elapsed -lt $MAX_WAIT ]; do
+    # Dump current logs
+    adb logcat -d -s python:I *:S > app_logs.txt
+
+    # Check if all success patterns are present
+    if grep --extended-regexp --quiet "I python[ ]+: Initialized python" app_logs.txt && \
+       grep --extended-regexp --quiet "I python[ ]+: Ran 14 tests in" app_logs.txt && \
+       grep --extended-regexp --quiet "I python[ ]+: OK" app_logs.txt; then
+        echo "✅ SUCCESS: App launched and all unit tests passed in ${elapsed}s."
+        exit 0
+    fi
+
+    # Check for early failure indicators
+    if grep --extended-regexp --quiet "I python[ ]+: FAILED" app_logs.txt; then
+        echo "❌ FAILURE: Tests failed after ${elapsed}s."
+        echo "--- Full Logs ---"
+        cat app_logs.txt
+        echo "-----------------"
+        exit 1
+    fi
+
+    sleep $POLL_INTERVAL
+    elapsed=$((elapsed + POLL_INTERVAL))
+    echo "Still waiting... (${elapsed}s elapsed)"
+done
+
+echo "❌ TIMEOUT: Tests did not complete within ${MAX_WAIT}s."
+echo "--- Full Logs ---"
+cat app_logs.txt
+echo "-----------------"
+exit 1

pythonforandroid/archs.py

@@ -132,10 +132,7 @@ def get_env(self, with_flags_in_cc=True):
         env['CPPFLAGS'] = ' '.join(self.common_cppflags).format(
             ctx=self.ctx,
             command_prefix=self.command_prefix,
-            python_includes=join(
-                self.ctx.get_python_install_dir(self.arch),
-                'include/python{}'.format(self.ctx.python_recipe.version[0:3]),
-            ),
+            python_includes=join(self.ctx.python_recipe.get_build_dir(self.arch), 'Include')
         )
 
         # LDFLAGS: Link the extra global link paths first before anything else

pythonforandroid/bootstraps/common/build/jni/application/src/start.c

@@ -31,6 +31,7 @@
 #define ENTRYPOINT_MAXLEN 128
 #define LOG(n, x) __android_log_write(ANDROID_LOG_INFO, (n), (x))
 #define LOGP(x) LOG("python", (x))
+#define P4A_MIN_VER 11
 
 static PyObject *androidembed_log(PyObject *self, PyObject *args) {
   char *logstr = NULL;
@@ -154,11 +155,6 @@ int main(int argc, char *argv[]) {
   Py_NoSiteFlag=1;
 #endif
 
-#if PY_MAJOR_VERSION < 3
-  Py_SetProgramName("android_python");
-#else
-  Py_SetProgramName(L"android_python");
-#endif
 
 #if PY_MAJOR_VERSION >= 3
   /* our logging module for android
@@ -174,40 +170,80 @@ int main(int argc, char *argv[]) {
   char python_bundle_dir[256];
   snprintf(python_bundle_dir, 256,
            "%s/_python_bundle", getenv("ANDROID_UNPACK"));
-  if (dir_exists(python_bundle_dir)) {
-    LOGP("_python_bundle dir exists");
-    snprintf(paths, 256,
-            "%s/stdlib.zip:%s/modules",
-            python_bundle_dir, python_bundle_dir);
 
-    LOGP("calculated paths to be...");
-    LOGP(paths);
+  #if PY_MAJOR_VERSION >= 3
 
-    #if PY_MAJOR_VERSION >= 3
-        wchar_t *wchar_paths = Py_DecodeLocale(paths, NULL);
-        Py_SetPath(wchar_paths);
+    #if PY_MINOR_VERSION >= P4A_MIN_VER
+      PyConfig config;
+      PyConfig_InitPythonConfig(&config);
+      config.program_name = L"android_python";
+    #else
+      Py_SetProgramName(L"android_python");
     #endif
 
-        LOGP("set wchar paths...");
+  #else
+    Py_SetProgramName("android_python");
+  #endif
+
+  if (dir_exists(python_bundle_dir)) {
+    LOGP("_python_bundle dir exists");
+
+      #if PY_MAJOR_VERSION >= 3
+          #if PY_MINOR_VERSION >= P4A_MIN_VER
+            
+            wchar_t wchar_zip_path[256];
+            wchar_t wchar_modules_path[256];
+            swprintf(wchar_zip_path, 256, L"%s/stdlib.zip", python_bundle_dir);
+            swprintf(wchar_modules_path, 256, L"%s/modules", python_bundle_dir);
+
+            config.module_search_paths_set = 1;
+            PyWideStringList_Append(&config.module_search_paths, wchar_zip_path);
+            PyWideStringList_Append(&config.module_search_paths, wchar_modules_path);
+        #else
+            char paths[512];
+            snprintf(paths, 512, "%s/stdlib.zip:%s/modules", python_bundle_dir, python_bundle_dir);
+            wchar_t *wchar_paths = Py_DecodeLocale(paths, NULL);
+            Py_SetPath(wchar_paths);
+        #endif
+      
+      #endif
+
+    LOGP("set wchar paths...");
   } else {
       LOGP("_python_bundle does not exist...this not looks good, all python"
            " recipes should have this folder, should we expect a crash soon?");
   }
 
-  Py_Initialize();
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= P4A_MIN_VER
+    PyStatus status = Py_InitializeFromConfig(&config);
+    if (PyStatus_Exception(status)) {
+        LOGP("Python initialization failed:");
+        LOGP(status.err_msg);
+    }
+#else
+    Py_Initialize();
+    LOGP("Python initialized using legacy Py_Initialize().");
+#endif
+
   LOGP("Initialized python");
 
-  /* ensure threads will work.
-   */
-  LOGP("AND: Init threads");
-  PyEval_InitThreads();
+  /* < 3.9 requires explicit GIL initialization
+  *  3.9+ PyEval_InitThreads() is deprecated and unnecessary
+  */
+  #if PY_VERSION_HEX < 0x03090000
+    LOGP("Initializing threads (required for Python < 3.9)");
+    PyEval_InitThreads();
+  #endif
 
 #if PY_MAJOR_VERSION < 3
   initandroidembed();
 #endif
 
-  PyRun_SimpleString("import androidembed\nandroidembed.log('testing python "
-                     "print redirection')");
+  PyRun_SimpleString(
+      "import androidembed\n"
+      "androidembed.log('testing python print redirection')"
+
+  );
 
   /* inject our bootstrap code to redirect python stdin/stdout
    * replace sys.path with our path