Skip to content

Commit 6420847

Browse files
authored
gh-146444: Don't package as part of iOS 'build hosts' target (#146628)
* Revert Py3.9 compatibility fixes. * Only build the package on 'build all'.
1 parent 7b2495e commit 6420847

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

Platforms/Apple/.ruff.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
extend = "../../.ruff.toml" # Inherit the project-wide settings
22

3-
# iOS buildbot worker uses Python 3.9
4-
target-version = "py39"
5-
63
[format]
74
preview = true
85
docstring-code-format = true

Platforms/Apple/__main__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@
5252
from os.path import basename, relpath
5353
from pathlib import Path
5454
from subprocess import CalledProcessError
55-
from typing import Union
5655

5756
EnvironmentT = dict[str, str]
58-
ArgsT = Sequence[Union[str, Path]]
57+
ArgsT = Sequence[str | Path]
5958

6059
SCRIPT_NAME = Path(__file__).name
6160
PYTHON_DIR = Path(__file__).resolve().parent.parent.parent
@@ -772,7 +771,7 @@ def build(context: argparse.Namespace, host: str | None = None) -> None:
772771
]:
773772
step(context, host=step_host)
774773

775-
if host in {"all", "hosts"}:
774+
if host == "all":
776775
package(context)
777776

778777

Platforms/Apple/testbed/__main__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import subprocess
88
import sys
99
from pathlib import Path
10-
from typing import Union
1110

1211
TEST_SLICES = {
1312
"iOS": "ios-arm64_x86_64-simulator",
@@ -263,7 +262,7 @@ def update_test_plan(testbed_path, platform, args):
263262

264263
def run_testbed(
265264
platform: str,
266-
simulator: Union[str, None],
265+
simulator: str | None,
267266
args: list[str],
268267
verbose: bool = False,
269268
):

0 commit comments

Comments
 (0)