Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python: add limited_api kwarg to find_installation() #14176

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

python: add limited_api kwarg to find_installation() #14176

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70f5af8
python module: add `limited_api` kwarg to find_installation()
lgarrison Jan 22, 2025
f1d648c
python module: add `limited_api` to dependency
lgarrison Jan 22, 2025
96b0eb1
python module: switch `extension_module` to propagate the `limited_ap…
lgarrison Jan 22, 2025
452c0f5
tests: add python `limited_api` tests for `find_installation` and `de…
lgarrison Jan 22, 2025
591f19d
python module: use `None` as `limited_api` sentinel
lgarrison Feb 7, 2025
a15d51e
python module: move windows limited api link args handling to dependency
lgarrison Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions mesonbuild/modules/python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def _get_path(self, state: T.Optional['ModuleState'], key: str) -> str:

_PURE_KW = KwargInfo('pure', (bool, NoneType))
_SUBDIR_KW = KwargInfo('subdir', str, default='')
_LIMITED_API_KW = KwargInfo('limited_api', str, default='', since='1.3.0')
_LIMITED_API_KW = KwargInfo('limited_api', str, default='inherit', since='1.3.0')
_DEFAULTABLE_SUBDIR_KW = KwargInfo('subdir', (str, NoneType))

class PythonInstallation(_ExternalProgramHolder['PythonExternalProgram']):
Expand Down Expand Up @@ -162,31 +162,19 @@ def extension_module_method(self, args: T.Tuple[str, T.List[BuildTargetSource]],
new_deps = mesonlib.extract_as_list(kwargs, 'dependencies')
pydep = next((dep for dep in new_deps if isinstance(dep, _PythonDependencyBase)), None)
if pydep is None:
pydep = self._dependency_method_impl({})
pydep = self._dependency_method_impl({'limited_api': kwargs.pop('limited_api', '')})
if not pydep.found():
raise mesonlib.MesonException('Python dependency not found')
new_deps.append(pydep)
FeatureNew.single_use('python_installation.extension_module with implicit dependency on python',
'0.63.0', self.subproject, 'use python_installation.dependency()',
self.current_node)

limited_api_version = kwargs.pop('limited_api')
allow_limited_api = self.interpreter.environment.coredata.get_option(OptionKey('python.allow_limited_api'))
if limited_api_version != '' and allow_limited_api:
if pydep.limited_api != '' and allow_limited_api:
lgarrison marked this conversation as resolved.
Show resolved Hide resolved

target_suffix = self.limited_api_suffix

limited_api_version_hex = self._convert_api_version_to_py_version_hex(limited_api_version, pydep.version)
limited_api_definition = f'-DPy_LIMITED_API={limited_api_version_hex}'

new_c_args = mesonlib.extract_as_list(kwargs, 'c_args')
new_c_args.append(limited_api_definition)
kwargs['c_args'] = new_c_args

new_cpp_args = mesonlib.extract_as_list(kwargs, 'cpp_args')
new_cpp_args.append(limited_api_definition)
kwargs['cpp_args'] = new_cpp_args

# On Windows, the limited API DLL is python3.dll, not python3X.dll.
for_machine = kwargs['native']
if self.interpreter.environment.machines[for_machine].is_windows():
Expand Down