Simpler Python init on Android (#37)

FeodorFitsner · web-flow · commit 0f7b5cb28268 · 2023-11-25T11:35:31.000-08:00
* Use simpler Python init logic for Android

* Bump version to 0.5.1
diff --git a/src/serious_python/CHANGELOG.md b/src/serious_python/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* Simplified Python initialization on Android.
+
 ## 0.5.0
 
 * Python 3.11.6 for all platforms.
diff --git a/src/serious_python/example/flask_example/ios/Podfile.lock b/src/serious_python/example/flask_example/ios/Podfile.lock
@@ -5,7 +5,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - serious_python_darwin (0.5.0):
+  - serious_python_darwin (0.5.1):
     - Flutter
     - FlutterMacOS
 
@@ -29,7 +29,7 @@ SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  serious_python_darwin: be59ff398a983746c5bb1c425d9e5caf706198e4
+  serious_python_darwin: 951b581b303b3c74e7511e306c0dc5a6ebd8b0d6
 
 PODFILE CHECKSUM: 7be2f5f74864d463a8ad433546ed1de7e0f29aef
 
diff --git a/src/serious_python/example/flask_example/pubspec.lock b/src/serious_python/example/flask_example/pubspec.lock
@@ -302,42 +302,42 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_android:
     dependency: transitive
     description:
       path: "../../../serious_python_android"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_darwin:
     dependency: transitive
     description:
       path: "../../../serious_python_darwin"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_linux:
     dependency: transitive
     description:
       path: "../../../serious_python_linux"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_platform_interface:
     dependency: transitive
     description:
       path: "../../../serious_python_platform_interface"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_windows:
     dependency: transitive
     description:
       path: "../../../serious_python_windows"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   sky_engine:
     dependency: transitive
     description: flutter
diff --git a/src/serious_python/example/flet_example/ios/Podfile.lock b/src/serious_python/example/flet_example/ios/Podfile.lock
@@ -48,7 +48,7 @@ PODS:
   - SDWebImage/Core (5.18.5)
   - sensors_plus (0.0.1):
     - Flutter
-  - serious_python_darwin (0.5.0):
+  - serious_python_darwin (0.5.1):
     - Flutter
     - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
@@ -110,7 +110,7 @@ SPEC CHECKSUMS:
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   SDWebImage: 7ac2b7ddc5e8484c79aa90fc4e30b149d6a2c88f
   sensors_plus: 5717760720f7e6acd96fdbd75b7428f5ad755ec2
-  serious_python_darwin: be59ff398a983746c5bb1c425d9e5caf706198e4
+  serious_python_darwin: 951b581b303b3c74e7511e306c0dc5a6ebd8b0d6
   shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
diff --git a/src/serious_python/example/flet_example/pubspec.lock b/src/serious_python/example/flet_example/pubspec.lock
@@ -509,42 +509,42 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_android:
     dependency: transitive
     description:
       path: "../../../serious_python_android"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_darwin:
     dependency: transitive
     description:
       path: "../../../serious_python_darwin"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_linux:
     dependency: transitive
     description:
       path: "../../../serious_python_linux"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_platform_interface:
     dependency: transitive
     description:
       path: "../../../serious_python_platform_interface"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_windows:
     dependency: transitive
     description:
       path: "../../../serious_python_windows"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   shake:
     dependency: transitive
     description:
diff --git a/src/serious_python/example/run_example/ios/Podfile.lock b/src/serious_python/example/run_example/ios/Podfile.lock
@@ -7,7 +7,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - serious_python_darwin (0.5.0):
+  - serious_python_darwin (0.5.1):
     - Flutter
     - FlutterMacOS
 
@@ -35,7 +35,7 @@ SPEC CHECKSUMS:
   integration_test: 13825b8a9334a850581300559b8839134b124670
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  serious_python_darwin: be59ff398a983746c5bb1c425d9e5caf706198e4
+  serious_python_darwin: 951b581b303b3c74e7511e306c0dc5a6ebd8b0d6
 
 PODFILE CHECKSUM: 7be2f5f74864d463a8ad433546ed1de7e0f29aef
 
diff --git a/src/serious_python/example/run_example/pubspec.lock b/src/serious_python/example/run_example/pubspec.lock
@@ -317,42 +317,42 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_android:
     dependency: transitive
     description:
       path: "../../../serious_python_android"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_darwin:
     dependency: transitive
     description:
       path: "../../../serious_python_darwin"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_linux:
     dependency: transitive
     description:
       path: "../../../serious_python_linux"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_platform_interface:
     dependency: transitive
     description:
       path: "../../../serious_python_platform_interface"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   serious_python_windows:
     dependency: transitive
     description:
       path: "../../../serious_python_windows"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.5.1"
   sky_engine:
     dependency: transitive
     description: flutter
diff --git a/src/serious_python/pubspec.yaml b/src/serious_python/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python
 description: A cross-platform plugin for adding embedded Python runtime to your Flutter apps.
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.5.0
+version: 0.5.1
 
 platforms:
   ios:
diff --git a/src/serious_python_android/CHANGELOG.md b/src/serious_python_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* Simplified Python initialization on Android.
+
 ## 0.5.0
 
 * Python 3.11.6.
diff --git a/src/serious_python_android/android/build.gradle b/src/serious_python_android/android/build.gradle
@@ -1,5 +1,5 @@
 group 'com.flet.serious_python_android'
-version '0.5.0'
+version '0.5.1'
 
 buildscript {
     repositories {
diff --git a/src/serious_python_android/lib/serious_python_android.dart b/src/serious_python_android/lib/serious_python_android.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:path/path.dart' as p;
 import 'package:serious_python_platform_interface/serious_python_platform_interface.dart';
 
 /// An implementation of [SeriousPythonPlatform] that uses method channels.
@@ -29,12 +30,9 @@ class SeriousPythonAndroid extends SeriousPythonPlatform {
       {List<String>? modulePaths,
       Map<String, String>? environmentVariables,
       bool? sync}) async {
-    // set environment variables
-    if (environmentVariables != null) {
-      for (var v in environmentVariables.entries) {
-        await methodChannel.invokeMethod<String>(
-            'setEnvironmentVariable', {'name': v.key, 'value': v.value});
-      }
+    Future setenv(String key, String value) async {
+      await methodChannel.invokeMethod<String>(
+          'setEnvironmentVariable', {'name': key, 'value': value});
     }
 
     // unpack python bundle
@@ -53,13 +51,34 @@ class SeriousPythonAndroid extends SeriousPythonPlatform {
 
     debugPrint("pythonLibPath: $pythonLibPath");
 
-    runPythonProgramFFI(
-        sync ?? false, "libpython3.11.so", pythonLibPath, appPath, [
+    var programDirPath = p.dirname(appPath);
+
+    var moduleSearchPaths = [
+      programDirPath,
+      "$programDirPath/__pypackages__",
       ...?modulePaths,
       "$pythonLibPath/modules",
       "$pythonLibPath/site-packages",
       "$pythonLibPath/stdlib.zip"
-    ]);
+    ];
+
+    setenv("PYTHONINSPECT", "1");
+    setenv("PYTHONOPTIMIZE", "2");
+    setenv("PYTHONDONTWRITEBYTECODE", "1");
+    setenv("PYTHONNOUSERSITE", "1");
+    setenv("PYTHONUNBUFFERED", "1");
+    setenv("LC_CTYPE", "UTF-8");
+    setenv("PYTHONHOME", pythonLibPath);
+    setenv("PYTHONPATH", moduleSearchPaths.join(":"));
+
+    // set environment variables
+    if (environmentVariables != null) {
+      for (var v in environmentVariables.entries) {
+        setenv(v.key, v.value);
+      }
+    }
+
+    runPythonProgramFFI(sync ?? false, "libpython3.11.so", appPath);
 
     return null;
   }
diff --git a/src/serious_python_android/pubspec.yaml b/src/serious_python_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_android
 description: Android implementation of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.5.0
+version: 0.5.1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_darwin/CHANGELOG.md b/src/serious_python_darwin/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* Simplified Python initialization on Android.
+
 ## 0.5.0
 
 * Python 3.11.6.
diff --git a/src/serious_python_darwin/darwin/serious_python_darwin.podspec b/src/serious_python_darwin/darwin/serious_python_darwin.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'serious_python_darwin'
-  s.version          = '0.5.0'
+  s.version          = '0.5.1'
   s.summary          = 'A cross-platform plugin for adding embedded Python runtime to your Flutter apps.'
   s.description      = <<-DESC
   A cross-platform plugin for adding embedded Python runtime to your Flutter apps.
diff --git a/src/serious_python_darwin/pubspec.yaml b/src/serious_python_darwin/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_darwin
 description: iOS and macOS implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.5.0
+version: 0.5.1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_linux/CHANGELOG.md b/src/serious_python_linux/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* Simplified Python initialization on Android.
+
 ## 0.5.0
 
 * Python 3.11.6.
diff --git a/src/serious_python_linux/pubspec.yaml b/src/serious_python_linux/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_linux
 description: Linux implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.5.0
+version: 0.5.1
 
 environment:
   sdk: '>=3.1.3 <4.0.0'
diff --git a/src/serious_python_platform_interface/CHANGELOG.md b/src/serious_python_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* Simplified Python initialization on Android.
+
 ## 0.5.0
 
 * Python 3.11.6.
diff --git a/src/serious_python_platform_interface/lib/src/cpython.dart b/src/serious_python_platform_interface/lib/src/cpython.dart
diff --git a/src/serious_python_platform_interface/pubspec.yaml b/src/serious_python_platform_interface/pubspec.yaml
diff --git a/src/serious_python_windows/CHANGELOG.md b/src/serious_python_windows/CHANGELOG.md
diff --git a/src/serious_python_windows/pubspec.yaml b/src/serious_python_windows/pubspec.yaml
