Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Python 3.13 #49

Merged
merged 20 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
39e0167
Remove references to deprecated modules.
freakboy3742 Nov 20, 2023
f72dabb
Make binary modules conditional on Python version.
freakboy3742 Nov 20, 2023
0d7fe21
Add 3.13 to the test matrix.
freakboy3742 Nov 21, 2023
2180763
Use linux to run Android tests.
freakboy3742 Nov 21, 2023
611925a
Add xfail strategy for third party binaries.
freakboy3742 Nov 21, 2023
a001520
Remove lru-dict wheels; 1.3.0 has been released, providing universal …
freakboy3742 Nov 21, 2023
69856df
Merge branch 'main' into py3.13-support
freakboy3742 Jul 26, 2024
92cf810
Update pyproject to new briefcase format, and drop Py3.8 support.
freakboy3742 Jul 29, 2024
5966053
Don't validate dead (or soon to be dead) batteries.
freakboy3742 Jul 30, 2024
cf2a6fc
Add a timeout for running the test suite.
freakboy3742 Jul 30, 2024
e8eee7c
Temporarily disable binary package tests.
freakboy3742 Aug 6, 2024
abace5e
Add missing icons.
freakboy3742 Aug 6, 2024
194585d
Clarify exclusions in CI and binary packaging.
freakboy3742 Aug 13, 2024
51a11be
Add CI exclusions for Linux/Windows 3.13 testing.
freakboy3742 Aug 13, 2024
ec0215e
Restore Android 3.11/3.12 exclusion.
freakboy3742 Aug 16, 2024
f88d063
Restore iOS binary package tests.
freakboy3742 Sep 1, 2024
fe24cda
Merge branch 'main' into py3.13-support
freakboy3742 Sep 2, 2024
50e83b7
Add a Python 3.13 macOS wheel for lru-dict.
freakboy3742 Sep 5, 2024
e747bc9
Merge branch 'main' into py3.13-support
freakboy3742 Sep 5, 2024
b7b2247
Only use --find-links for macOS.
freakboy3742 Sep 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- "windows-app"
- "iOS"
- "android"
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13-dev" ]
include:
- runs-on: ubuntu-latest
- pre-command:
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
briefcase-run-args: ' -d "iPhone SE (3rd generation)"'

- backend: android
runs-on: "ubuntu-latest"
runs-on: ubuntu-latest
briefcase-target: "android"
briefcase-run-args: >
--device '{"avd":"beePhone"}'
Expand All @@ -106,12 +106,22 @@ jobs:
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
exclude:
# Binary packages aren't available for 3.11+ on Android yet
- backend: "android"
# Cryptography isn't available for 3.11+ on Android yet
- backend: android
python-version: "3.11"

- backend: "android"
- backend: android
python-version: "3.12"
# Binary packages aren't available for 3.13 on Android yet
- backend: android
python-version: "3.13-dev"
# Support package isn't available for 3.13 on Linux
- backend: "linux-flatpak"
python-version: "3.13-dev"
# Support package isn't available for 3.13 on Window
- backend: "windows-VisualStudio"
python-version: "3.13-dev"
- backend: "windows-app"
python-version: "3.13-dev"

steps:
- name: Checkout
Expand All @@ -132,6 +142,7 @@ jobs:
uses: beeware/.github/.github/actions/install-briefcase@main

- name: Test App
timeout-minutes: 15
run: briefcase run ${{ matrix.briefcase-target }} --test ${{ matrix.briefcase-run-args }}

- name: Package
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added icons/testbed-1280.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added icons/testbed-1920.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added icons/testbed-640.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added icons/testbed.icns
Binary file not shown.
23 changes: 12 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project_name = "Testbed"
bundle = "org.beeware"
version = "0.0.1"
url = "https://beeware.org"
license = "BSD license"
license.file = "LICENSE"
author = 'Russell Keith-Magee'
author_email = "russell@beeware.org"

Expand All @@ -14,17 +14,17 @@ long_description = """A test of common use cases and known problems with bundled

Validates 3rd party module loading, as well as basic app packaging.
"""
icon = "src/testbed/resources/testbed"
icon = "icons/testbed"
sources = ["src/testbed"]
test_sources = ["tests"]

requires = [
# Binary wheels on iOS all need to be updated for the new sysconfig platform tag.
"cryptography; platform_system != 'iOS'",
"lru_dict; platform_system != 'iOS'",
"pillow; platform_system != 'iOS'",
"numpy; platform_system != 'iOS'",
"pandas; platform_system != 'iOS'",
"cryptography",
"lru_dict",
"pillow",
# Numpy/pandas aren't available on 3.13.
"numpy; python_version < '3.13'",
"pandas; python_version < '3.13'",
]
test_requires = [
"pytest",
Expand All @@ -37,10 +37,11 @@ requires = [
"rubicon-objc",
"std-nslog",
]
# support_package = "../Python-Apple-support/dist/Python-3.8-macOS-support.custom.tar.gz"
# support_package = "../Python-Apple-support/dist/Python-3.13-macOS-support.custom.tar.gz"

[tool.briefcase.app.testbed.macOS.app]
# template = "../../templates/briefcase-macOS-app-template"
# stub_binary = "../../templates/briefcase-macOS-Xcode-template/stub/build/gui-stub/macos/xcode/build/Release/GUI Stub.app/Contents/MacOS/GUI Stub"

[tool.briefcase.app.testbed.macOS.Xcode]
# template = "../../templates/briefcase-macOS-Xcode-template"
Expand Down Expand Up @@ -93,7 +94,7 @@ requires = [
"rubicon-objc",
"std-nslog",
]
# support_package = "../Python-Apple-support/dist/Python-3.8-iOS-support.custom.tar.gz"
# support_package = "../Python-Apple-support/dist/Python-3.13-iOS-support.custom.tar.gz"
# template = "../../templates/briefcase-iOS-Xcode-template"

[tool.briefcase.app.testbed.android]
Expand All @@ -102,7 +103,7 @@ requires = [
"tzdata",
]

# support_package = "../Python-Android-support/dist/Python-3.10-Android-support.custom.zip"
# support_package = "../Python-Android-support/dist/Python-3.13-Android-support.custom.zip"
# template = "../../templates/briefcase-Android-gradle-template"

[tool.isort]
Expand Down
4 changes: 1 addition & 3 deletions tests/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_bootstrap_modules():


def test_stdlib_modules():
"All the stdlib modules exist"
"All the stdlib binary modules exist"
missing = []
all_modules = [
"_asyncio",
Expand Down Expand Up @@ -95,8 +95,6 @@ def test_stdlib_modules():
"syslog",
"termios",
"unicodedata",
# Scheduled for deprecation
"audioop",
]

# Modules added in 3.8
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.