[3.14] gh-146444: Don't package as part of iOS 'build hosts' target (GH-146628) ...

gh-146444: Don't package as part of iOS 'build hosts' target (GH-146628)

* Revert Py3.9 compatibility fixes.
* Only build the package on 'build all'.
(cherry picked from commit 6420847bdaa945fb13251d3f93968946c0f3444f)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>

diff --git a/Apple/.ruff.toml b/Apple/.ruff.toml
index ce3be314f690d7ce5d40b8cc7e820e7435fb5032..4cdc39ebee4be9baa90aec6a317e9c63ebd81444 100644 (file)
--- a/Apple/.ruff.toml
+++ b/Apple/.ruff.toml
@@ -1,8 +1,5 @@
 extend = "../.ruff.toml"  # Inherit the project-wide settings
 
-# iOS buildbot worker uses Python 3.9
-target-version = "py39"
-
 [format]
 preview = true
 docstring-code-format = true

diff --git a/Apple/__main__.py b/Apple/__main__.py
index 862a471cb8c142aaa03b2cbffd42b3c007fbcc2f..af20fce67daee18f7d9dfd796557d6409000d7f5 100644 (file)
--- a/Apple/__main__.py
+++ b/Apple/__main__.py
@@ -52,10 +52,9 @@ from datetime import datetime, timezone
 from os.path import basename, relpath
 from pathlib import Path
 from subprocess import CalledProcessError
-from typing import Union
 
 EnvironmentT = dict[str, str]
-ArgsT = Sequence[Union[str, Path]]
+ArgsT = Sequence[str | Path]
 
 SCRIPT_NAME = Path(__file__).name
 PYTHON_DIR = Path(__file__).resolve().parent.parent
@@ -769,7 +768,7 @@ def build(context: argparse.Namespace, host: str | None = None) -> None:
         ]:
             step(context, host=step_host)
 
-    if host in {"all", "hosts"}:
+    if host == "all":
         package(context)
 
 

diff --git a/Apple/testbed/__main__.py b/Apple/testbed/__main__.py
index 96da1f9c7525f1f55d6e9aaf158cb29745082272..0dd77ab8b827974ea5b8ebd3c48ee47f9538c612 100644 (file)
--- a/Apple/testbed/__main__.py
+++ b/Apple/testbed/__main__.py
@@ -7,7 +7,6 @@ import shutil
 import subprocess
 import sys
 from pathlib import Path
-from typing import Union
 
 TEST_SLICES = {
     "iOS": "ios-arm64_x86_64-simulator",
@@ -263,7 +262,7 @@ def update_test_plan(testbed_path, platform, args):
 
 def run_testbed(
     platform: str,
-    simulator: Union[str, None],
+    simulator: str | None,
     args: list[str],
     verbose: bool = False,
 ):