diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fbd17b..81ca9f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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"}' @@ -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 @@ -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 diff --git a/src/testbed/resources/testbed-1024.png b/icons/testbed-1024.png similarity index 100% rename from src/testbed/resources/testbed-1024.png rename to icons/testbed-1024.png diff --git a/src/testbed/resources/testbed-120.png b/icons/testbed-120.png similarity index 100% rename from src/testbed/resources/testbed-120.png rename to icons/testbed-120.png diff --git a/src/testbed/resources/testbed-128.png b/icons/testbed-128.png similarity index 100% rename from src/testbed/resources/testbed-128.png rename to icons/testbed-128.png diff --git a/icons/testbed-1280.png b/icons/testbed-1280.png new file mode 100644 index 0000000..c84d215 Binary files /dev/null and b/icons/testbed-1280.png differ diff --git a/src/testbed/resources/testbed-152.png b/icons/testbed-152.png similarity index 100% rename from src/testbed/resources/testbed-152.png rename to icons/testbed-152.png diff --git a/src/testbed/resources/testbed-16.png b/icons/testbed-16.png similarity index 100% rename from src/testbed/resources/testbed-16.png rename to icons/testbed-16.png diff --git a/src/testbed/resources/testbed-167.png b/icons/testbed-167.png similarity index 100% rename from src/testbed/resources/testbed-167.png rename to icons/testbed-167.png diff --git a/src/testbed/resources/testbed-180.png b/icons/testbed-180.png similarity index 100% rename from src/testbed/resources/testbed-180.png rename to icons/testbed-180.png diff --git a/icons/testbed-1920.png b/icons/testbed-1920.png new file mode 100644 index 0000000..72608c9 Binary files /dev/null and b/icons/testbed-1920.png differ diff --git a/src/testbed/resources/testbed-20.png b/icons/testbed-20.png similarity index 100% rename from src/testbed/resources/testbed-20.png rename to icons/testbed-20.png diff --git a/src/testbed/resources/testbed-256.png b/icons/testbed-256.png similarity index 100% rename from src/testbed/resources/testbed-256.png rename to icons/testbed-256.png diff --git a/src/testbed/resources/testbed-29.png b/icons/testbed-29.png similarity index 100% rename from src/testbed/resources/testbed-29.png rename to icons/testbed-29.png diff --git a/src/testbed/resources/testbed-32.png b/icons/testbed-32.png similarity index 100% rename from src/testbed/resources/testbed-32.png rename to icons/testbed-32.png diff --git a/src/testbed/resources/testbed-40.png b/icons/testbed-40.png similarity index 100% rename from src/testbed/resources/testbed-40.png rename to icons/testbed-40.png diff --git a/src/testbed/resources/testbed-512.png b/icons/testbed-512.png similarity index 100% rename from src/testbed/resources/testbed-512.png rename to icons/testbed-512.png diff --git a/src/testbed/resources/testbed-58.png b/icons/testbed-58.png similarity index 100% rename from src/testbed/resources/testbed-58.png rename to icons/testbed-58.png diff --git a/src/testbed/resources/testbed-60.png b/icons/testbed-60.png similarity index 100% rename from src/testbed/resources/testbed-60.png rename to icons/testbed-60.png diff --git a/src/testbed/resources/testbed-64.png b/icons/testbed-64.png similarity index 100% rename from src/testbed/resources/testbed-64.png rename to icons/testbed-64.png diff --git a/icons/testbed-640.png b/icons/testbed-640.png new file mode 100644 index 0000000..8b62552 Binary files /dev/null and b/icons/testbed-640.png differ diff --git a/src/testbed/resources/testbed-76.png b/icons/testbed-76.png similarity index 100% rename from src/testbed/resources/testbed-76.png rename to icons/testbed-76.png diff --git a/src/testbed/resources/testbed-80.png b/icons/testbed-80.png similarity index 100% rename from src/testbed/resources/testbed-80.png rename to icons/testbed-80.png diff --git a/src/testbed/resources/testbed-87.png b/icons/testbed-87.png similarity index 100% rename from src/testbed/resources/testbed-87.png rename to icons/testbed-87.png diff --git a/icons/testbed.icns b/icons/testbed.icns new file mode 100644 index 0000000..a659298 Binary files /dev/null and b/icons/testbed.icns differ diff --git a/pyproject.toml b/pyproject.toml index 3fc39d4..128b934 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" @@ -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", @@ -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" @@ -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] @@ -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] diff --git a/tests/test_common.py b/tests/test_common.py index 730bfe0..bf15300 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -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", @@ -95,8 +95,6 @@ def test_stdlib_modules(): "syslog", "termios", "unicodedata", - # Scheduled for deprecation - "audioop", ] # Modules added in 3.8 diff --git a/wheels/cffi-1.16.0-cp38-cp38-macosx_11_0_universal2.whl b/wheels/cffi-1.16.0-cp38-cp38-macosx_11_0_universal2.whl deleted file mode 100644 index 703f591..0000000 Binary files a/wheels/cffi-1.16.0-cp38-cp38-macosx_11_0_universal2.whl and /dev/null differ diff --git a/wheels/lru_dict-1.2.0-cp310-cp310-macosx_11_0_universal2.whl b/wheels/lru_dict-1.2.0-cp310-cp310-macosx_11_0_universal2.whl deleted file mode 100644 index fd81760..0000000 Binary files a/wheels/lru_dict-1.2.0-cp310-cp310-macosx_11_0_universal2.whl and /dev/null differ diff --git a/wheels/lru_dict-1.2.0-cp311-cp311-macosx_11_0_universal2.whl b/wheels/lru_dict-1.2.0-cp311-cp311-macosx_11_0_universal2.whl deleted file mode 100644 index f295a20..0000000 Binary files a/wheels/lru_dict-1.2.0-cp311-cp311-macosx_11_0_universal2.whl and /dev/null differ diff --git a/wheels/lru_dict-1.2.0-cp312-cp312-macosx_11_0_universal2.whl b/wheels/lru_dict-1.2.0-cp312-cp312-macosx_11_0_universal2.whl deleted file mode 100644 index 24193d3..0000000 Binary files a/wheels/lru_dict-1.2.0-cp312-cp312-macosx_11_0_universal2.whl and /dev/null differ diff --git a/wheels/lru_dict-1.2.0-cp38-cp38-macosx_11_0_universal2.whl b/wheels/lru_dict-1.2.0-cp38-cp38-macosx_11_0_universal2.whl deleted file mode 100644 index c9cd73a..0000000 Binary files a/wheels/lru_dict-1.2.0-cp38-cp38-macosx_11_0_universal2.whl and /dev/null differ diff --git a/wheels/lru_dict-1.2.0-cp39-cp39-macosx_11_0_universal2.whl b/wheels/lru_dict-1.2.0-cp39-cp39-macosx_11_0_universal2.whl deleted file mode 100644 index 9ebb591..0000000 Binary files a/wheels/lru_dict-1.2.0-cp39-cp39-macosx_11_0_universal2.whl and /dev/null differ diff --git a/wheels/lru_dict-1.3.0-cp313-cp313-macosx_10_9_universal2.whl b/wheels/lru_dict-1.3.0-cp313-cp313-macosx_10_9_universal2.whl new file mode 100644 index 0000000..c18cf90 Binary files /dev/null and b/wheels/lru_dict-1.3.0-cp313-cp313-macosx_10_9_universal2.whl differ