Replace the inline free-threaded checks with a function as well

Signed-off-by: Michał Górny <mgorny@quansight.com>

Author: mgorny

mesonpy/__init__.py

@@ -334,6 +334,11 @@ def _is_abi3t_capable() -> bool:
     return sys.version_info >= (3, 15, 0, 'beta', 2)
 
 
+def _is_free_threaded() -> bool:
+    """Return true if we are running a free-threaded (no-GIL) Python."""
+    return sysconfig.get_config_var('Py_GIL_DISABLED')
+
+
 @dataclasses.dataclass
 class _WheelBuilder():
     """Helper class to build wheels from projects."""
@@ -435,7 +440,7 @@ def _stable_abi(self) -> Optional[str]:
             # building 'abi3t' wheels for the time being. In the future
             # we will want an option to target 'abi3t' from GIL-enabled
             # Python too.
-            is_abi3t = bool(sysconfig.get_config_var('Py_GIL_DISABLED')) and _is_abi3t_capable()
+            is_abi3t = _is_free_threaded() and _is_abi3t_capable()
             expected_abi = 'abi3t' if is_abi3t else 'abi3'
 
             # Verify stable ABI compatibility: examine files installed
@@ -886,7 +891,7 @@ def __init__(
             if not allow_limited_api:
                 self._limited_api = False
 
-        if self._limited_api and bool(sysconfig.get_config_var('Py_GIL_DISABLED')) and not _is_abi3t_capable():
+        if self._limited_api and _is_free_threaded() and not _is_abi3t_capable():
             raise BuildError(
                 'The package targets Python\'s Limited API, which is not supported by free-threaded CPython < 3.15.0b2. '
                 'The "python.allow_limited_api" Meson build option may be used to override the package default.')

tests/test_editable.py

@@ -18,7 +18,7 @@
 
 from mesonpy import _editable
 
-from .test_wheel import EXT_SUFFIX, NOGIL_BUILD
+from .test_wheel import EXT_SUFFIX
 
 
 def find_cython_version():
@@ -75,7 +75,7 @@ def test_collect(package_complex):
     assert tree['complex']['more']['__init__.py'] == os.path.join(root, 'complex', 'more', '__init__.py')
 
 
-@pytest.mark.skipif(NOGIL_BUILD and CYTHON_VERSION < (3, 1, 0),
+@pytest.mark.skipif(mesonpy._is_free_threaded() and CYTHON_VERSION < (3, 1, 0),
                     reason='Cython version too old, no free-threaded CPython support')
 def test_mesonpy_meta_finder(package_complex, tmp_path):
     # build a package in a temporary directory
@@ -210,7 +210,7 @@ def test_editble_reentrant(venv, editable_imports_itself_during_build):
         path.write_text(code)
 
 
-@pytest.mark.skipif(NOGIL_BUILD and CYTHON_VERSION < (3, 1, 0),
+@pytest.mark.skipif(mesonpy._is_free_threaded() and CYTHON_VERSION < (3, 1, 0),
                     reason='Cython version too old, no free-threaded CPython support')
 def test_editable_pkgutils_walk_packages(package_complex, tmp_path):
     # build a package in a temporary directory
@@ -296,7 +296,7 @@ def test_editable_rebuild(package_purelib_and_platlib, tmp_path, verbose, args):
             sys.modules.pop('pure', None)
 
 
-@pytest.mark.skipif(NOGIL_BUILD and CYTHON_VERSION < (3, 1, 0),
+@pytest.mark.skipif(mesonpy._is_free_threaded() and CYTHON_VERSION < (3, 1, 0),
                     reason='Cython version too old, no free-threaded CPython support')
 def test_editable_verbose(venv, package_complex, editable_complex, monkeypatch):
     monkeypatch.setenv('MESONPY_EDITABLE_VERBOSE', '1')

tests/test_tags.py

@@ -19,7 +19,6 @@
 import mesonpy._tags
 
 from .conftest import adjust_packaging_platform_tag
-from .test_wheel import NOGIL_BUILD
 
 
 # Test against the wheel tag generated by packaging module.
@@ -133,7 +132,7 @@ def test_tag_stable_abi():
     # PyPy does not support the stable ABI.
     if '__pypy__' in sys.builtin_module_names:
         abi = ABI
-    elif NOGIL_BUILD and mesonpy._is_abi3t_capable():
+    elif mesonpy._is_free_threaded() and mesonpy._is_abi3t_capable():
         abi = 'abi3.abi3t'
     else:
         abi = 'abi3'

tests/test_wheel.py

@@ -35,8 +35,6 @@
     'win32': '.dll',
 }.get(sys.platform, '.so')
 
-NOGIL_BUILD = bool(sysconfig.get_config_var('Py_GIL_DISABLED'))
-
 # Test against the wheel tag generated by packaging module.
 tag = next(packaging.tags.sys_tags())
 ABI = tag.abi
@@ -321,7 +319,7 @@ def test_skip_subprojects(package_subproject, tmp_path, arg):
 
 # Requires Meson 1.3.0, see https://github.com/mesonbuild/meson/pull/11745.
 @pytest.mark.skipif(MESON_VERSION < (1, 2, 99), reason='meson too old')
-@pytest.mark.skipif(NOGIL_BUILD, reason='Free-threaded CPython does not support the limited API')
+@pytest.mark.skipif(mesonpy._is_free_threaded(), reason='Free-threaded CPython does not support the limited API')
 @pytest.mark.xfail('__pypy__' in sys.builtin_module_names, reason='PyPy does not support the abi3 platform tag for wheels')
 def test_limited_api(wheel_limited_api):
     artifact = wheel.wheelfile.WheelFile(wheel_limited_api)
@@ -333,7 +331,7 @@ def test_limited_api(wheel_limited_api):
 
 # Requires Meson 1.3.0, see https://github.com/mesonbuild/meson/pull/11745.
 @pytest.mark.skipif(MESON_VERSION < (1, 2, 99), reason='meson too old')
-@pytest.mark.skipif(NOGIL_BUILD, reason='Free-threaded CPython does not support the limited API')
+@pytest.mark.skipif(mesonpy._is_free_threaded(), reason='Free-threaded CPython does not support the limited API')
 @pytest.mark.xfail('__pypy__' in sys.builtin_module_names, reason='PyPy does not use special modules suffix for stable ABI')
 def test_limited_api_bad(package_limited_api, tmp_path):
     with pytest.raises(mesonpy.BuildError, match='The package declares compatibility with Python limited API but '):
@@ -421,5 +419,5 @@ def test_limited_api_ft(wheel_limited_api_ft):
     artifact = wheel.wheelfile.WheelFile(wheel_limited_api_ft)
     name = artifact.parsed_filename
     assert name.group('pyver') == INTERPRETER
-    assert name.group('abi') == 'abi3.abi3t' if NOGIL_BUILD else 'abi3'
+    assert name.group('abi') == 'abi3.abi3t' if mesonpy._is_free_threaded() else 'abi3'
     assert name.group('plat') == PLATFORM