Merge pull request #28 from beeware/framework-lib

Switch to dynamic framework builds.
beeware · Aug 11, 2024 · b92f444 · b92f444
2 parents 2dcd9e9 + 9de09f2
commit b92f444
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,5 +38,5 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13-dev" ]
         framework: [ "toga" ]
diff --git a/{{ cookiecutter.format }}/briefcase.toml b/{{ cookiecutter.format }}/briefcase.toml
@@ -1,19 +1,19 @@
 # Generated using Python {{ cookiecutter.python_version }}
 [briefcase]
-# This is the start of the new-style dylib era.
-target_version = "0.3.16"
+# This is the start of the PEP 730 framework era.
+target_version = "0.3.20"
 
 [paths]
 app_path = "{{ cookiecutter.class_name }}/app"
 app_packages_path = "{{ cookiecutter.class_name }}/app_packages"
 info_plist_path = "{{ cookiecutter.class_name }}/{{ cookiecutter.class_name }}-Info.plist"
 support_path = "Support"
 {{ {
-    "3.8": "support_revision = 14",
-    "3.9": "support_revision = 12",
-    "3.10": "support_revision = 8",
-    "3.11": "support_revision = 3",
-    "3.12": "support_revision = 2",
+    "3.9": "support_revision = 13",
+    "3.10": "support_revision = 9",
+    "3.11": "support_revision = 4",
+    "3.12": "support_revision = 3",
+    "3.13": "support_revision = 0",
 }.get(cookiecutter.python_version|py_tag, "") }}
 
 icon.20 = "{{ cookiecutter.class_name }}/Images.xcassets/AppIcon.appiconset/icon-20.png"

diff --git a/{{ cookiecutter.format }}/{{ cookiecutter.class_name }}/main.m b/{{ cookiecutter.format }}/{{ cookiecutter.class_name }}/main.m
@@ -5,7 +5,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#include <Python.h>
+#include <Python/Python.h>
 #include <dlfcn.h>
 
 
@@ -17,6 +17,7 @@ int main(int argc, char *argv[]) {
     PyStatus status;
     PyPreConfig preconfig;
     PyConfig config;
+    NSString *python_tag;
     NSString *python_home;
     NSString *app_module_name;
     NSString *path;
@@ -35,7 +36,7 @@ int main(int argc, char *argv[]) {
     PyObject *systemExit_code;
 
     @autoreleasepool {
-        NSString * resourcePath = [[NSBundle mainBundle] resourcePath];
+        NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
 
         // Generate an isolated Python configuration.
         NSLog(@"Configuring isolated Python...");
@@ -65,7 +66,8 @@ int main(int argc, char *argv[]) {
         }
 
         // Set the home for the Python interpreter
-        python_home = [NSString stringWithFormat:@"%@/python-stdlib", resourcePath, nil];
+        python_tag = @"{{ cookiecutter.python_version|py_tag }}";
+        python_home = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
         NSLog(@"PythonHome: %@", python_home);
         wtmp_str = Py_DecodeLocale([python_home UTF8String], NULL);
         status = PyConfig_SetString(&config, &config.home, wtmp_str);
@@ -99,20 +101,20 @@ int main(int argc, char *argv[]) {
 
         // Set the full module path. This includes the stdlib, site-packages, and app code.
         NSLog(@"PYTHONPATH:");
-        // // The .zip form of the stdlib
-        // path = [NSString stringWithFormat:@"%@/python{{ cookiecutter.python_version|py_libtag }}.zip", resourcePath, nil];
-        // NSLog(@"- %@", path);
-        // wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
-        // status = PyWideStringList_Append(&config.module_search_paths, wtmp_str);
-        // if (PyStatus_Exception(status)) {
-        //     crash_dialog([NSString stringWithFormat:@"Unable to set .zip form of stdlib path: %s", status.err_msg, nil]);
-        //     PyConfig_Clear(&config);
-        //     Py_ExitStatusException(status);
-        // }
-        // PyMem_RawFree(wtmp_str);
-
         // The unpacked form of the stdlib
-        path = [NSString stringWithFormat:@"%@/python-stdlib", resourcePath, nil];
+        path = [NSString stringWithFormat:@"%@/lib/python%@", python_home, python_tag, nil];
+        NSLog(@"- %@", path);
+        wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
+        status = PyWideStringList_Append(&config.module_search_paths, wtmp_str);
+        if (PyStatus_Exception(status)) {
+            crash_dialog([NSString stringWithFormat:@"Unable to set unpacked form of stdlib path: %s", status.err_msg, nil]);
+            PyConfig_Clear(&config);
+            Py_ExitStatusException(status);
+        }
+        PyMem_RawFree(wtmp_str);
+
+        // The binary modules in the stdlib
+        path = [NSString stringWithFormat:@"%@/lib/python%@/lib-dynload", python_home, python_tag, nil];
         NSLog(@"- %@", path);
         wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
         status = PyWideStringList_Append(&config.module_search_paths, wtmp_str);