From 04966e101bbbb477196f3607f71b30e6fd9236d3 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 18 Dec 2024 07:45:14 +0800 Subject: [PATCH 1/3] Adds initial support for Python3.14. --- pyproject.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1bf2c02..924d3ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,9 +22,9 @@ requires = [ "cryptography", "lru_dict", "pillow", - # Numpy/pandas aren't available for iOS on 3.13+. - "numpy; python_version < '3.13' or platform_system != 'iOS'", - "pandas; python_version < '3.13' or platform_system != 'iOS'", + # Numpy/pandas aren't available for iOS on 3.13+, or at all on 3.14. + "numpy; python_version < '3.13' or (platform_system != 'iOS' and python_version < '3.14')", + "pandas; python_version < '3.13' or (platform_system != 'iOS' and python_version < '3.14')", ] test_requires = [ "pytest", @@ -37,7 +37,7 @@ requires = [ "rubicon-objc", "std-nslog", ] -# support_package = "../Python-Apple-support/dist/Python-3.13-macOS-support.custom.tar.gz" +# support_package = "../Python-Apple-support/dist/Python-3.14-macOS-support.custom.tar.gz" [tool.briefcase.app.testbed.macOS.app] # template = "../../templates/briefcase-macOS-app-template" @@ -77,8 +77,8 @@ flatpak_sdk = "org.gnome.Sdk" [tool.briefcase.app.testbed.windows] requires = [ - # Python.net isn't avaialble for 3.13 yet. - "pythonnet>=3.0.0rc6; python_version < '3.13'", + # Python.net isn't avaialble for 3.14 yet. + "pythonnet>=3.0.0rc6; python_version < '3.14'", # Windows doesn't provide the zoneinfo TZ database; use the Python provided one "tzdata", ] @@ -95,7 +95,7 @@ requires = [ "rubicon-objc", "std-nslog", ] -# support_package = "../Python-Apple-support/dist/Python-3.13-iOS-support.custom.tar.gz" +# support_package = "../Python-Apple-support/dist/Python-3.14-iOS-support.custom.tar.gz" # template = "../../templates/briefcase-iOS-Xcode-template" [tool.briefcase.app.testbed.android] @@ -110,7 +110,7 @@ build_gradle_dependencies = [ "com.google.android.material:material:1.11.0", ] -# support_package = "../Python-Android-support/dist/Python-3.13-Android-support.custom.zip" +# support_package = "../Python-Android-support/dist/Python-3.14-Android-support.custom.zip" # template = "../../templates/briefcase-Android-gradle-template" [tool.isort] From fae802b674f782f90c7f62a1818ba9c7e7799ac4 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Wed, 18 Dec 2024 10:29:15 +0000 Subject: [PATCH 2/3] Update pythonnet dependency to use stable versions --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 924d3ba..6c605d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,7 +78,7 @@ flatpak_sdk = "org.gnome.Sdk" [tool.briefcase.app.testbed.windows] requires = [ # Python.net isn't avaialble for 3.14 yet. - "pythonnet>=3.0.0rc6; python_version < '3.14'", + "pythonnet>=3.0.0; python_version < '3.14'", # Windows doesn't provide the zoneinfo TZ database; use the Python provided one "tzdata", ] From 87a39467b5ccfd935ecbfafaa33daffc6f55fb9c Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Wed, 18 Dec 2024 10:29:28 +0000 Subject: [PATCH 3/3] Remove obsolete reference to Android support package, and correct repository capitalization --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6c605d3..549382d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -110,8 +110,7 @@ build_gradle_dependencies = [ "com.google.android.material:material:1.11.0", ] -# support_package = "../Python-Android-support/dist/Python-3.14-Android-support.custom.zip" -# template = "../../templates/briefcase-Android-gradle-template" +# template = "../../templates/briefcase-android-gradle-template" [tool.isort] profile = "black"