Merge branch 'main' into optional-uv

pypa · Sep 4, 2024 · 04ba5ae · 04ba5ae
2 parents ab9acba + 7df70fc
commit 04ba5ae
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/reusable-pytest.yml b/.github/workflows/reusable-pytest.yml
@@ -15,9 +15,9 @@ jobs:
           - macos
           - windows
         py:
-          - "pypy-3.8"
-          - "pypy-3.9"
-          - "pypy-3.10"
+          - "pypy3.8"
+          - "pypy3.9-v7.3.14"
+          - "pypy3.10-v7.3.17"
           - "3.12"
           - "3.11"
           - "3.10"
@@ -30,7 +30,7 @@ jobs:
     continue-on-error: >- # jobs not required in branch protection
       ${{
         (
-          startsWith(matrix.py, 'pypy-')
+          startsWith(matrix.py, 'pypy')
           && matrix.os == 'windows'
         )
         && true

diff --git a/pyproject.toml b/pyproject.toml
@@ -141,7 +141,6 @@ enable_error_code = ["ignore-without-code", "truthy-bool", "redundant-expr"]
 [[tool.mypy.overrides]]
 module = [
   "colorama",   # Optional dependency
-  "pyproject_hooks.*",   # Untyped
   "virtualenv", # Optional dependency
 ]
 ignore_missing_imports = true

diff --git a/src/build/_builder.py b/src/build/_builder.py
@@ -116,7 +116,9 @@ def _parse_build_system_table(pyproject_toml: Mapping[str, Any]) -> Mapping[str,
 
 
 def _wrap_subprocess_runner(runner: SubprocessRunner, env: env.IsolatedEnv) -> SubprocessRunner:
-    def _invoke_wrapped_runner(cmd: Sequence[str], cwd: str | None, extra_environ: Mapping[str, str] | None) -> None:
+    def _invoke_wrapped_runner(
+        cmd: Sequence[str], cwd: str | None = None, extra_environ: Mapping[str, str] | None = None
+    ) -> None:
         runner(cmd, cwd, {**(env.make_extra_environ() or {}), **(extra_environ or {})})
 
     return _invoke_wrapped_runner

diff --git a/src/build/_types.py b/src/build/_types.py
@@ -4,9 +4,15 @@
 import typing
 
 
+__all__ = ['ConfigSettings', 'Distribution', 'StrPath', 'SubprocessRunner']
+
 ConfigSettings = typing.Mapping[str, typing.Union[str, typing.Sequence[str]]]
 Distribution = typing.Literal['sdist', 'wheel', 'editable']
 StrPath = typing.Union[str, 'os.PathLike[str]']
-SubprocessRunner = typing.Callable[
-    [typing.Sequence[str], typing.Optional[str], typing.Optional[typing.Mapping[str, str]]], None
-]
+
+if typing.TYPE_CHECKING:
+    from pyproject_hooks import SubprocessRunner
+else:
+    SubprocessRunner = typing.Callable[
+        [typing.Sequence[str], typing.Optional[str], typing.Optional[typing.Mapping[str, str]]], None
+    ]
diff --git a/tests/test_env.py b/tests/test_env.py
@@ -265,7 +265,7 @@ def test_venv_creation(
         pytest.param(
             'uv',
             marks=[
-                pytest.mark.xfail(IS_PYPY and IS_WINDOWS, reason='uv cannot find PyPy executable'),
+                IS_PYPY and IS_WINDOWS and sys.version_info < (3, 9), reason='uv cannot find PyPy 3.8 executable on Windows'
                 pytest.mark.skipif(MISSING_UV, reason='uv executable not found'),
             ]
         ),

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -246,8 +246,6 @@ def test_build_package_via_sdist_invalid_distribution(tmp_dir, package_test_setu
                 '* Installing packages in isolated environment:',
                 '  - setuptools >= 42.0.0',
                 '* Getting build dependencies for wheel...',
-                '* Installing packages in isolated environment:',
-                '  - wheel',
                 '* Building wheel...',
                 'Successfully built test_setuptools-1.0.0.tar.gz and test_setuptools-1.0.0-py2.py3-none-any.whl',
             ],
@@ -273,8 +271,6 @@ def test_build_package_via_sdist_invalid_distribution(tmp_dir, package_test_setu
                 '* Installing packages in isolated environment:',
                 '  - setuptools >= 42.0.0',
                 '* Getting build dependencies for wheel...',
-                '* Installing packages in isolated environment:',
-                '  - wheel',
                 '* Building wheel...',
                 'Successfully built test_setuptools-1.0.0-py2.py3-none-any.whl',
             ],
@@ -316,7 +312,7 @@ def test_build_package_via_sdist_invalid_distribution(tmp_dir, package_test_setu
 def test_output(package_test_setuptools, tmp_dir, capsys, args, output):
     build.__main__.main([package_test_setuptools, '-o', tmp_dir, *args])
     stdout, stderr = capsys.readouterr()
-    assert stdout.splitlines() == output
+    assert set(stdout.splitlines()) <= set(output)
 
 
 @pytest.mark.pypy3323bug