MAINT: remove indirection for creation of the wheel builder

Author: dnicolodi

mesonpy/__init__.py

@@ -737,17 +737,8 @@ def _configure(self, reconfigure: bool = False) -> None:
         ]
         if reconfigure:
             setup_args.insert(0, '--reconfigure')
-
         self._run(['meson', 'setup', *setup_args])
 
-    @cached_property
-    def _wheel_builder(self) -> _WheelBuilder:
-        return _WheelBuilder(
-            self._metadata,
-            self._manifest,
-            self._limited_api,
-        )
-
     @property
     def _build_command(self) -> List[str]:
         assert self._ninja is not None  # help mypy out
@@ -891,13 +882,15 @@ def sdist(self, directory: Path) -> pathlib.Path:
     def wheel(self, directory: Path) -> pathlib.Path:
         """Generates a wheel (binary distribution) in the specified directory."""
         self.build()
-        file = self._wheel_builder.build(directory)
+        builder = _WheelBuilder(self._metadata, self._manifest, self._is_pure, self._limited_api)
+        file = builder.build(directory)
         assert isinstance(file, pathlib.Path)
         return file
 
     def editable(self, directory: Path) -> pathlib.Path:
         self.build()
-        file = self._wheel_builder.build_editable(directory, self._source_dir, self._build_dir, self._build_command, self._editable_verbose)
+        builder = _WheelBuilder(self._metadata, self._manifest, self._is_pure, self._limited_api)
+        file = builder.build_editable(directory, self._source_dir, self._build_dir, self._build_command, self._editable_verbose)
         assert isinstance(file, pathlib.Path)
         return file
 

tests/test_wheel.py

@@ -232,13 +232,15 @@ def test_entrypoints(wheel_full_metadata):
 
 def test_top_level_modules(package_module_types):
     with mesonpy._project() as project:
-        assert set(project._wheel_builder.top_level_modules) == {
+        builder = mesonpy._WheelBuilder(project._metadata, project._manifest, project._is_pure, project._limited_api)
+        assert set(builder.top_level_modules) == {
             'file',
             'package',
             'namespace',
             'native',
         }
 
+
 def test_purelib_platlib_split(package_purelib_platlib_split, tmp_path):
     with pytest.raises(mesonpy.BuildError, match='The purelib-platlib-split package is split'):
         with mesonpy._project() as project: