Merge pull request #1934 from freakboy3742/version-bumps

Drop Python 3.8 support and bump macOS/iOS template epoch

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ "macos-12", "macos-14", "windows-latest", "ubuntu-latest" ]
-        python-version: [ "3.8", "3.12", "3.13-dev" ]
+        python-version: [ "3.9", "3.12", "3.13-dev" ]
         include:
           - experimental: false
           - platform: "ubuntu-latest"
@@ -80,10 +80,6 @@ jobs:
           # Allow dev Python to fail without failing entire job
           - python-version: "3.13-dev"
             experimental: true
-        exclude:
-          # macos-14 (i.e. arm64) does not support Python 3.8
-          - platform: "macos-14"
-            python-version: "3.8"
     steps:
     - name: Checkout
       uses: actions/[email protected]
@@ -145,7 +141,7 @@ jobs:
       with:
         # Use minimum version of python for coverage to avoid phantom branches
         # https://github.com/nedbat/coveragepy/issues/1572#issuecomment-1522546425
-        python-version: "3.8"
+        python-version: "3.9"
 
     - name: Install Tox
       uses: beeware/.github/.github/actions/install-requirement@main

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
     rev: v3.17.0
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
   - repo: https://github.com/PyCQA/isort
     rev: 5.13.2
     hooks:

changes/1934.removal.1.rst

@@ -0,0 +1 @@
+Support for Python 3.8 was dropped.

changes/1934.removal.2.rst

@@ -0,0 +1 @@
+macOS and iOS templates have both had an epoch increase. macOS and iOS projects created with previous versions of Briefcase will need to be re-generated.

docs/background/faq.rst

@@ -4,7 +4,7 @@ Frequently Asked Questions
 What version of Python does Briefcase support?
 ----------------------------------------------
 
-Python 3.8 or higher.
+Python 3.9 or higher.
 
 What platforms does Briefcase support?
 --------------------------------------

docs/reference/platforms/linux/system.rst

@@ -104,7 +104,7 @@ normalization of code name and version is performed, so ``ubuntu:jammy`` and
 same version).
 
 You can specify any identifier you want, provided the distribution is still
-supported by the vendor, and system Python is Python 3.8 or later.
+supported by the vendor, and system Python is Python 3.9 or later.
 
 The following Linux vendors are known to work as Docker targets:
 

pyproject.toml

@@ -11,7 +11,7 @@ dynamic = ["version"]
 name = "briefcase"
 description = "Tools to support converting a Python project into a standalone native application."
 readme = "README.rst"
-requires-python = ">= 3.8"
+requires-python = ">= 3.9"
 license.text = "New BSD"
 authors = [
     {name="Russell Keith-Magee", email="[email protected]"},
@@ -48,7 +48,6 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -98,9 +97,7 @@ dependencies = [
 dev = [
     "coverage[toml] == 7.6.1",
     "coverage-conditional-plugin == 0.9.0",
-    # Pre-commit 3.6.0 deprecated support for Python 3.8
-    "pre-commit == 3.5.0 ; python_version < '3.9'",
-    "pre-commit == 3.8.0 ; python_version >= '3.9'",
+    "pre-commit == 3.8.0",
     "pytest == 8.3.2",
     "pytest-xdist == 3.6.1",
     "setuptools_scm == 8.1.0",

src/briefcase/commands/new.py

@@ -4,9 +4,8 @@
 import sys
 import unicodedata
 from collections import OrderedDict
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 from email.utils import parseaddr
-from typing import Iterable
 
 if sys.version_info >= (3, 10):  # pragma: no-cover-if-lt-py310
     from importlib.metadata import entry_points

src/briefcase/console.py

@@ -10,11 +10,12 @@
 import textwrap
 import time
 import traceback
+from collections.abc import Iterable
 from contextlib import contextmanager
 from datetime import datetime
 from enum import IntEnum
 from pathlib import Path
-from typing import Callable, Iterable
+from typing import Callable
 
 from rich.console import Console as RichConsole
 from rich.control import strip_control_codes

src/briefcase/integrations/docker.py

@@ -5,9 +5,9 @@
 import socket
 import subprocess
 import sys
+from collections.abc import Iterable, Mapping
 from functools import lru_cache
 from pathlib import Path, PosixPath, PurePosixPath
-from typing import Iterable, Mapping
 
 from packaging.version import InvalidVersion, Version
 

src/briefcase/integrations/file.py

@@ -5,10 +5,10 @@
 import shutil
 import sys
 import tempfile
+from collections.abc import Iterable, Sequence
 from contextlib import suppress
 from email.message import Message
 from pathlib import Path
-from typing import TYPE_CHECKING
 from urllib.parse import urlparse
 
 import requests.exceptions as requests_exceptions
@@ -21,9 +21,6 @@
 )
 from briefcase.integrations.base import Tool, ToolCache
 
-if TYPE_CHECKING:
-    from typing import Iterable, Sequence
-
 
 class File(Tool):
     name = "file"

src/briefcase/integrations/subprocess.py

@@ -10,11 +10,11 @@
 import sys
 import threading
 import time
-from collections.abc import Callable
+from collections.abc import Callable, Iterator, Mapping, Sequence
 from functools import wraps
 from pathlib import Path
 from subprocess import CompletedProcess
-from typing import Iterator, Mapping, Sequence, TypeVar, Union
+from typing import TypeVar, Union
 
 import psutil
 

src/briefcase/integrations/windows_sdk.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import subprocess
+from collections.abc import Iterator
 from pathlib import Path
-from typing import Iterator
 
 # winreg can only be imported on Windows
 try:

src/briefcase/platforms/iOS/__init__.py

@@ -9,8 +9,8 @@ class iOSMixin:
     supported_host_os_reason = (
         "iOS applications require Xcode, which is only available on macOS."
     )
-    # 0.3.16 introduced new-style dylib support.
-    platform_target_version = "0.3.16"
+    # 0.3.20 introduced PEP 730-style dynamic libraries.
+    platform_target_version = "0.3.20"
 
     def verify_tools(self):
         Xcode.verify(self.tools, min_version=(13, 0, 0))

src/briefcase/platforms/iOS/xcode.py

@@ -514,11 +514,14 @@ def run_app(
         # Try to uninstall the app first. If the app hasn't been installed
         # before, this will still succeed.
         self.logger.info(f"Installing {label}...", prefix=app.app_name)
-        with self.input.wait_bar(
-            "Uninstalling any existing app version..."
-        ) as keep_alive, self.tools.subprocess.Popen(
-            ["xcrun", "simctl", "uninstall", udid, app.bundle_identifier]
-        ) as uninstall_popen:
+        with (
+            self.input.wait_bar(
+                "Uninstalling any existing app version..."
+            ) as keep_alive,
+            self.tools.subprocess.Popen(
+                ["xcrun", "simctl", "uninstall", udid, app.bundle_identifier]
+            ) as uninstall_popen,
+        ):
             while (ret_code := uninstall_popen.poll()) is None:
                 keep_alive.update()
                 time.sleep(0.25)
@@ -529,11 +532,12 @@ def run_app(
             )
 
         # Install the app.
-        with self.input.wait_bar(
-            f"Installing new {label} version..."
-        ) as keep_alive, self.tools.subprocess.Popen(
-            ["xcrun", "simctl", "install", udid, self.binary_path(app)]
-        ) as install_popen:
+        with (
+            self.input.wait_bar(f"Installing new {label} version...") as keep_alive,
+            self.tools.subprocess.Popen(
+                ["xcrun", "simctl", "install", udid, self.binary_path(app)]
+            ) as install_popen,
+        ):
             while (ret_code := install_popen.poll()) is None:
                 keep_alive.update()
                 time.sleep(0.25)

src/briefcase/platforms/linux/__init__.py

@@ -3,7 +3,6 @@
 import subprocess
 import sys
 from pathlib import Path
-from typing import List
 
 from briefcase.commands.create import _is_local_requirement
 from briefcase.commands.open import OpenCommand
@@ -134,7 +133,7 @@ def local_requirements_path(self, app):
     def _install_app_requirements(
         self,
         app: AppConfig,
-        requires: List[str],
+        requires: list[str],
         app_packages_path: Path,
     ):
         """Install requirements for the app with pip.
@@ -197,7 +196,7 @@ def _install_app_requirements(
             app_packages_path=app_packages_path,
         )
 
-    def _pip_requires(self, app: AppConfig, requires: List[str]):
+    def _pip_requires(self, app: AppConfig, requires: list[str]):
         """Convert the requirements list to an .deb project compatible format.
 
         Any local file requirements are converted into a reference to the file generated

src/briefcase/platforms/macOS/__init__.py

@@ -72,6 +72,8 @@ class macOSMixin:
     platform = "macOS"
     supported_host_os = {"Darwin"}
     supported_host_os_reason = "macOS applications can only be built on macOS."
+    # 0.3.20 introduced a framework-based support package.
+    platform_target_version = "0.3.20"
 
 
 class macOSCreateMixin(AppPackagesMergeMixin):

src/briefcase/platforms/web/static.py

@@ -4,7 +4,7 @@
 import webbrowser
 from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
 from pathlib import Path
-from typing import Any, List
+from typing import Any
 from zipfile import ZipFile
 
 from briefcase.console import Log
@@ -297,7 +297,7 @@ def run_app(
         self,
         app: AppConfig,
         test_mode: bool,
-        passthrough: List[str],
+        passthrough: list[str],
         host,
         port,
         open_browser,

src/briefcase/platforms/windows/__init__.py

@@ -2,7 +2,6 @@
 import subprocess
 import uuid
 from pathlib import Path, PurePath
-from typing import List
 from zipfile import ZIP_DEFLATED, ZipFile
 
 from briefcase.commands import CreateCommand, PackageCommand, RunCommand
@@ -131,7 +130,7 @@ def run_app(
         self,
         app: AppConfig,
         test_mode: bool,
-        passthrough: List[str],
+        passthrough: list[str],
         **kwargs,
     ):
         """Start the application.

tests/commands/base/test_properties.py

@@ -2,7 +2,7 @@
 
 
 def test_briefcase_required_python_version(base_command):
-    assert base_command.briefcase_required_python_version == (3, 8)
+    assert base_command.briefcase_required_python_version == (3, 9)
 
 
 def test_bundle_path(base_command, my_app, tmp_path):

tests/integrations/base/test_tool_registry.py

@@ -1,15 +1,14 @@
 import inspect
 import pkgutil
 import sys
-from typing import Dict, Set, Type
 
 import pytest
 
 import briefcase.integrations
 from briefcase.integrations.base import ManagedTool, Tool, tool_registry
 
 
-def integrations_modules() -> Set[str]:
+def integrations_modules() -> set[str]:
     """All modules in ``briefcase.integrations`` irrespective of whether they are
     defined in ``briefcase.integrations.__all__``"""
     return {
@@ -19,23 +18,23 @@ def integrations_modules() -> Set[str]:
     }
 
 
-def tools_for_module(tool_module_name: str) -> Dict[str, Type[Tool]]:
+def tools_for_module(tool_module_name: str) -> dict[str, type[Tool]]:
     """Return classes that subclass Tool in a module in ``briefcase.integrations``, e.g.
     {"android_sdk": AndroidSDK}."""
     return dict(
         inspect.getmembers(
             sys.modules[f"briefcase.integrations.{tool_module_name}"],
             lambda klass: (
                 inspect.isclass(klass)
+                and not inspect.isabstract(klass)
                 and issubclass(klass, (Tool, ManagedTool))
-                and klass not in {Tool, ManagedTool}
             ),
         )
     )
 
 
 @pytest.fixture
-def all_defined_tools() -> Set[Type[Tool]]:
+def all_defined_tools() -> set[type[Tool]]:
     """All classes under ``briefcase.integrations`` that subclass Tool."""
     return {
         tool

tests/platforms/linux/system/test_mixin__verify_python.py

@@ -105,7 +105,7 @@ def test_target_too_old(create_command, first_app_config):
     with pytest.raises(
         BriefcaseCommandError,
         match=r"The system python3 version provided by somevendor:surprising "
-        r"is 3\.7\.16; Briefcase requires a minimum Python3 version of 3\.8\.",
+        r"is 3\.7\.16; Briefcase requires a minimum Python3 version of 3\.9\.",
     ):
         create_command.verify_python(first_app_config)
 

tests/platforms/macOS/app/conftest.py

@@ -31,6 +31,9 @@ def first_app_templated(first_app_config, tmp_path):
     create_file(
         tmp_path / "base_path/build/first-app/macos/app/briefcase.toml",
         """
+[briefcase]
+target_version = "0.3.20"
+
 [paths]
 app_packages_path="First App.app/Contents/Resources/app_packages"
 support_path="First App.app/Contents/Frameworks"