feat(cli,templates): add pythonVersion config, fix Android build, and wire pip requirements

owenthcarey · owenthcarey · commit a529834a7bfe · 2026-04-02T23:49:12.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10', '3.11']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
       - name: Checkout
diff --git a/examples/hello-world/app/main_page.py b/examples/hello-world/app/main_page.py
@@ -1,7 +1,11 @@
 from typing import Any
 
+import emoji
+
 import pythonnative as pn
 
+MEDALS = [":1st_place_medal:", ":2nd_place_medal:", ":3rd_place_medal:"]
+
 
 class MainPage(pn.Page):
     def __init__(self, native_instance: Any) -> None:
@@ -12,10 +16,13 @@ def increment(self) -> None:
         self.set_state(count=self.state["count"] + 1)
 
     def render(self) -> pn.Element:
+        count = self.state["count"]
+        medal = emoji.emojize(MEDALS[count] if count < len(MEDALS) else ":star:")
         return pn.ScrollView(
             pn.Column(
                 pn.Text("Hello from PythonNative Demo!", font_size=24, bold=True),
-                pn.Text(f"Tapped {self.state['count']} times", font_size=16),
+                pn.Text(f"Tapped {count} times", font_size=16),
+                pn.Text(medal, font_size=32),
                 pn.Button("Tap me", on_click=self.increment, background_color="#FF1E88E5"),
                 pn.Button(
                     "Go to Second Page",
diff --git a/examples/hello-world/pythonnative.json b/examples/hello-world/pythonnative.json
@@ -2,6 +2,7 @@
   "name": "PythonNative Demo",
   "appId": "com.pythonnative.demo",
   "entryPoint": "app/main_page.py",
+  "pythonVersion": "3.11",
   "ios": {},
   "android": {}
 }
diff --git a/examples/hello-world/requirements.txt b/examples/hello-world/requirements.txt
@@ -1 +1 @@
-pythonnative
+emoji
diff --git a/src/pythonnative/cli/pn.py b/src/pythonnative/cli/pn.py
@@ -2,6 +2,7 @@
 import hashlib
 import json
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -73,16 +74,17 @@ def render(self):
         "name": project_name,
         "appId": "com.example." + project_name.replace(" ", "").lower(),
         "entryPoint": "app/main_page.py",
+        "pythonVersion": "3.11",
         "ios": {},
         "android": {},
     }
     with open(config_path, "w", encoding="utf-8") as f:
         json.dump(config, f, indent=2)
 
-    # Requirements
+    # Requirements (third-party packages only; pythonnative itself is bundled by the CLI)
     if not os.path.exists(requirements_path) or args.force:
         with open(requirements_path, "w", encoding="utf-8") as f:
-            f.write("pythonnative\n")
+            f.write("")
 
     # .gitignore
     default_gitignore = "# PythonNative\n" "__pycache__/\n" "*.pyc\n" ".venv/\n" "build/\n" ".DS_Store\n"
@@ -215,6 +217,43 @@ def create_ios_project(project_name: str, destination: str) -> None:
     _copy_bundled_template_dir("ios_template", destination)
 
 
+def _read_project_config() -> dict:
+    """Read pythonnative.json from the current working directory."""
+    config_path = os.path.join(os.getcwd(), "pythonnative.json")
+    if os.path.exists(config_path):
+        with open(config_path, encoding="utf-8") as f:
+            return json.load(f)
+    return {}
+
+
+def _read_requirements(requirements_path: str) -> list[str]:
+    """Read a requirements file and return non-empty, non-comment lines.
+
+    Exits with an error if pythonnative is listed — the CLI bundles it
+    directly, so it must not be installed separately via pip/Chaquopy.
+    """
+    if not os.path.exists(requirements_path):
+        return []
+    with open(requirements_path, encoding="utf-8") as f:
+        lines = f.readlines()
+    result: list[str] = []
+    for line in lines:
+        stripped = line.strip()
+        if not stripped or stripped.startswith("#") or stripped.startswith("-"):
+            continue
+        pkg_name = re.split(r"[\[><=!;]", stripped)[0].strip()
+        if pkg_name.lower().replace("-", "_") == "pythonnative":
+            print(
+                "Error: 'pythonnative' must not be in requirements.txt.\n"
+                "The pn CLI automatically bundles the installed pythonnative into your app.\n"
+                "requirements.txt is for third-party packages only (e.g. humanize, requests).\n"
+                "Remove the pythonnative line from requirements.txt and try again."
+            )
+            sys.exit(1)
+        result.append(stripped)
+    return result
+
+
 def run_project(args: argparse.Namespace) -> None:
     """
     Run the specified project.
@@ -223,8 +262,13 @@ def run_project(args: argparse.Namespace) -> None:
     platform: str = args.platform
     prepare_only: bool = getattr(args, "prepare_only", False)
 
+    # Read project configuration and save project root before any chdir
+    project_dir: str = os.getcwd()
+    config = _read_project_config()
+    python_version: str = config.get("pythonVersion", "3.11")
+
     # Define the build directory
-    build_dir: str = os.path.join(os.getcwd(), "build", platform)
+    build_dir: str = os.path.join(project_dir, "build", platform)
 
     # Create the build directory if it doesn't exist
     os.makedirs(build_dir, exist_ok=True)
@@ -268,10 +312,30 @@ def run_project(args: argparse.Namespace) -> None:
         # Non-fatal; fallback to the packaged PyPI dependency if present
         pass
 
-    # Install any necessary Python packages into the project environment
+    # Validate and read the user's requirements.txt
+    requirements_path = os.path.join(project_dir, "requirements.txt")
+    pip_reqs = _read_requirements(requirements_path)
+
+    if platform == "android":
+        # Patch the Android build.gradle with the configured Python version
+        app_build_gradle = os.path.join(build_dir, "android_template", "app", "build.gradle")
+        if os.path.exists(app_build_gradle):
+            with open(app_build_gradle, encoding="utf-8") as f:
+                content = f.read()
+            content = content.replace('version "3.11"', f'version "{python_version}"')
+            with open(app_build_gradle, "w", encoding="utf-8") as f:
+                f.write(content)
+        # Copy requirements.txt into the Android project for Chaquopy
+        android_reqs_path = os.path.join(build_dir, "android_template", "app", "requirements.txt")
+        if os.path.exists(requirements_path):
+            shutil.copy2(requirements_path, android_reqs_path)
+        else:
+            with open(android_reqs_path, "w", encoding="utf-8") as f:
+                f.write("")
+
+    # Install any necessary Python packages into the host environment
     # Skip installation during prepare-only to avoid network access and speed up scaffolding
     if not prepare_only:
-        requirements_path = os.path.join(os.getcwd(), "requirements.txt")
         if os.path.exists(requirements_path):
             subprocess.run([sys.executable, "-m", "pip", "install", "-r", requirements_path], check=False)
 
@@ -523,6 +587,29 @@ def run_project(args: argparse.Namespace) -> None:
                 except Exception:
                     # Non-fatal; if metadata isn't present, rubicon import may fail and fallback UI will appear
                     pass
+                # Install user's pip requirements (pure-Python packages) into the app bundle
+                if pip_reqs:
+                    try:
+                        reqs_tmp = os.path.join(build_dir, "ios_requirements.txt")
+                        with open(reqs_tmp, "w", encoding="utf-8") as f:
+                            f.write("\n".join(pip_reqs) + "\n")
+                        tmp_reqs_dir = os.path.join(build_dir, "ios_user_packages")
+                        if os.path.isdir(tmp_reqs_dir):
+                            shutil.rmtree(tmp_reqs_dir)
+                        os.makedirs(tmp_reqs_dir, exist_ok=True)
+                        subprocess.run(
+                            [sys.executable, "-m", "pip", "install", "-t", tmp_reqs_dir, "-r", reqs_tmp],
+                            check=False,
+                        )
+                        for entry in os.listdir(tmp_reqs_dir):
+                            src_entry = os.path.join(tmp_reqs_dir, entry)
+                            dst_entry = os.path.join(platform_site_dir, entry)
+                            if os.path.isdir(src_entry):
+                                shutil.copytree(src_entry, dst_entry, dirs_exist_ok=True)
+                            else:
+                                shutil.copy2(src_entry, dst_entry)
+                    except Exception:
+                        pass
                 # Note: Python.xcframework provides a static library for Simulator; it must be linked at build time.
                 # We copy the XCFramework into the project directory above so Xcode can link it.
             except Exception:
diff --git a/src/pythonnative/templates/android_template/app/build.gradle b/src/pythonnative/templates/android_template/app/build.gradle
@@ -20,14 +20,9 @@ android {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
         }
         python {
-            version "3.8"
+            version "3.11"
             pip {
-                install "matplotlib"
-                install "pythonnative"
-
-                // "-r"` followed by a requirements filename, relative to the
-                // project directory:
-//                install "-r", "requirements.txt"
+                install "-r", "requirements.txt"
             }
         }
     }
diff --git a/src/pythonnative/templates/android_template/build.gradle b/src/pythonnative/templates/android_template/build.gradle
@@ -3,5 +3,5 @@ plugins {
     id 'com.android.application' version '8.2.2' apply false
     id 'com.android.library' version '8.2.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
-    id 'com.chaquo.python' version '14.0.2' apply false
+    id 'com.chaquo.python' version '15.0.1' apply false
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`"name": "PythonNative Demo",`
`3`	`3`	`"appId": "com.pythonnative.demo",`
`4`	`4`	`"entryPoint": "app/main_page.py",`
	`5`	`+ "pythonVersion": "3.11",`
`5`	`6`	`"ios": {},`
`6`	`7`	`"android": {}`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,9 @@ android {`
`20`	`20`	`abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"`
`21`	`21`	`}`
`22`	`22`	`python {`
`23`		`- version "3.8"`
	`23`	`+ version "3.11"`
`24`	`24`	`pip {`
`25`		`- install "matplotlib"`
`26`		`- install "pythonnative"`
`27`		`-`
`28`		- // "-r"` followed by a requirements filename, relative to the
`29`		`- // project directory:`
`30`		`-// install "-r", "requirements.txt"`
	`25`	`+ install "-r", "requirements.txt"`
`31`	`26`	`}`
`32`	`27`	`}`
`33`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ plugins {`
`3`	`3`	`id 'com.android.application' version '8.2.2' apply false`
`4`	`4`	`id 'com.android.library' version '8.2.2' apply false`
`5`	`5`	`id 'org.jetbrains.kotlin.android' version '1.9.22' apply false`
`6`		`- id 'com.chaquo.python' version '14.0.2' apply false`
	`6`	`+ id 'com.chaquo.python' version '15.0.1' apply false`
`7`	`7`	`}`