wip

Author: dnicolodi

tests/conftest.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-import argparse
 import contextlib
 import importlib.metadata
 import os
@@ -199,22 +198,16 @@ def cleanenv():
 def meson_fatal_warnings():
     # Cannot use the 'monkeypatch' fixture because of scope mismatch.
     mpatch = pytest.MonkeyPatch()
-    mesonpy_get_meson_args = mesonpy._get_meson_args
-
-    def _get_meson_args(args):
-        meson_args = mesonpy_get_meson_args(args)
-        meson_setup_args = meson_args['setup']
-
-        # Add ``--fatal-meson-warnings`` to the ``meson setup`` arguments
-        # unless the project specifies ``--no-fatal-meson-warnings`` in
-        # ``tool.meson-build.args.setup``.
-        parser = argparse.ArgumentParser(add_help=False)
-        parser.add_argument('--no-fatal-meson-warnings', action='store_true')
-        args, meson_setup_args = parser.parse_known_args(meson_setup_args)
-        if not args.no_fatal_meson_warnings:
-            meson_setup_args.append('--fatal-meson-warnings')
-
-        meson_args['setup'] = meson_setup_args
-        return meson_args
-
-    mpatch.setattr(mesonpy, '_get_meson_args', _get_meson_args)
+    mesonpy_project_init = mesonpy.Project.__init__
+
+    def __init__(self, source_dir, build_dir, meson_args=None, editable_verbose=False):
+        if pathlib.Path(source_dir).absolutre().name not in {
+                'cmake-subproject',
+                'link-against-local-lib',
+        }:
+            if meson_args is None:
+                meson_args = {}
+            meson_args.setdefault('setup', []).append('--fatal-meson-warnings')
+        mesonpy_project_init(self, source_dir, build_dir, meson_args, editable_verbose)
+
+    mpatch.setattr(mesonpy.Project, '__init__', __init__)

tests/packages/link-against-local-lib/pyproject.toml

@@ -8,6 +8,3 @@ requires = ['meson-python']
 
 [tool.meson-python]
 allow-windows-internal-shared-libs = true
-
-[tool.meson-python.args]
-setup = ['--no-fatal-meson-warnings']