Skip to content

Commit

Permalink
ENH: implement variables substitution in configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
dnicolodi committed Sep 6, 2023
1 parent 71f5926 commit 58bba11
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 0 deletions.
1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ py.install_sources(
'mesonpy/_compat.py',
'mesonpy/_editable.py',
'mesonpy/_rpath.py',
'mesonpy/_substitutions.py',
'mesonpy/_tags.py',
'mesonpy/_util.py',
'mesonpy/_wheelfile.py',
Expand Down
7 changes: 7 additions & 0 deletions mesonpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

import mesonpy._compat
import mesonpy._rpath
import mesonpy._substitutions
import mesonpy._tags
import mesonpy._util
import mesonpy._wheelfile
Expand Down Expand Up @@ -660,6 +661,12 @@ def __init__( # noqa: C901
# load meson args from pyproject.toml
pyproject_config = _validate_pyproject_config(pyproject)
for key, value in pyproject_config.get('args', {}).items():
# apply variable interpolation
try:
value = [mesonpy._substitutions.interpolate(x) for x in value]
except ValueError as exc:
raise ConfigError(
f'Cannot interpret value for "tool.meson-python.args.{key}" configuration entry: {exc.args[0]}') from None
self._meson_args[key].extend(value)

# meson arguments from the command line take precedence over
Expand Down
99 changes: 99 additions & 0 deletions mesonpy/_substitutions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
# SPDX-FileCopyrightText: 2023 The meson-python developers
#
# SPDX-License-Identifier: MIT

from __future__ import annotations

import ast
import operator
import sys
import typing


if typing.TYPE_CHECKING: # pragma: no cover
from typing import Any, Callable, Mapping, Optional, Type


_methods = {}


def _register(nodetype: Type[ast.AST]) -> Callable[..., Callable[..., Any]]:
def closure(method: Callable[[Interpreter, ast.AST], Any]) -> Callable[[Interpreter, ast.AST], Any]:
_methods[nodetype] = method
return method
return closure


class Interpreter:

_operators = {
ast.Add: operator.add,
ast.Sub: operator.sub,
ast.Mult: operator.mul,
ast.Div: operator.truediv,
}

def __init__(self, variables: Mapping[str, Any]):
self._variables = variables

def eval(self, string: str) -> Any:
try:
expr = ast.parse(string, mode='eval')
return self._eval(expr)
except KeyError as exc:
raise ValueError(f'unknown variable "{exc.args[0]}"') from exc
except NotImplementedError as exc:
raise ValueError(f'invalid expression {string!r}') from exc

__getitem__ = eval

def _eval(self, node: ast.AST) -> Any:
# Cannot use functools.singlemethoddispatch as long as Python 3.7 is supported.
method = _methods.get(type(node), None)
if method is None:
raise NotImplementedError

Check warning on line 54 in mesonpy/_substitutions.py

View check run for this annotation

Codecov / codecov/patch

mesonpy/_substitutions.py#L54

Added line #L54 was not covered by tests
return method(self, node)

@_register(ast.Expression)
def _expression(self, node: ast.Expression) -> Any:
return self._eval(node.body)

@_register(ast.BinOp)
def _binop(self, node: ast.BinOp) -> Any:
func = self._operators.get(type(node.op))
if func is None:
raise NotImplementedError
return func(self._eval(node.left), self._eval(node.right))

@_register(ast.Constant)
def _constant(self, node: ast.Constant) -> Any:
return node.value

if sys.version_info < (3, 8):

# Python 3.7, replaced by ast.Constant is later versions.
@_register(ast.Num)
def _num(self, node: ast.Num) -> Any:

Check warning on line 76 in mesonpy/_substitutions.py

View check run for this annotation

Codecov / codecov/patch

mesonpy/_substitutions.py#L76

Added line #L76 was not covered by tests
return node.n

# Python 3.7, replaced by ast.Constant is later versions.
@_register(ast.Str)
def _str(self, node: ast.Str) -> Any:
return node.s

Check warning on line 82 in mesonpy/_substitutions.py

View check run for this annotation

Codecov / codecov/patch

mesonpy/_substitutions.py#L81-L82

Added lines #L81 - L82 were not covered by tests

@_register(ast.Name)
def _variable(self, node: ast.Name) -> Any:
value = self._variables[node.id]
if callable(value):
value = value()
return value


def _ncores() -> int:
return 42

Check warning on line 93 in mesonpy/_substitutions.py

View check run for this annotation

Codecov / codecov/patch

mesonpy/_substitutions.py#L93

Added line #L93 was not covered by tests


def interpolate(string: str, variables: Optional[Mapping[str, Any]] = None) -> str:
if variables is None:
variables = {'ncores': _ncores}
return string % Interpreter(variables)
5 changes: 5 additions & 0 deletions tests/packages/substitutions-invalid/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-FileCopyrightText: 2023 The meson-python developers
#
# SPDX-License-Identifier: MIT

project('substitutions', version: '0.0.1')
10 changes: 10 additions & 0 deletions tests/packages/substitutions-invalid/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# SPDX-FileCopyrightText: 2023 The meson-python developers
#
# SPDX-License-Identifier: MIT

[build-system]
build-backend = 'mesonpy'
requires = ['meson-python']

[tool.meson-python.args]
compile = ['-j', '%(xxx)d']
5 changes: 5 additions & 0 deletions tests/packages/substitutions/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-FileCopyrightText: 2023 The meson-python developers
#
# SPDX-License-Identifier: MIT

project('substitutions', version: '0.0.1')
10 changes: 10 additions & 0 deletions tests/packages/substitutions/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# SPDX-FileCopyrightText: 2023 The meson-python developers
#
# SPDX-License-Identifier: MIT

[build-system]
build-backend = 'mesonpy'
requires = ['meson-python']

[tool.meson-python.args]
compile = ['-j', '%(ncores / 2 + 2)d']
34 changes: 34 additions & 0 deletions tests/test_substitutions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# SPDX-FileCopyrightText: 2023 The meson-python developers
#
# SPDX-License-Identifier: MIT

import pytest

import mesonpy


def test_interpolate():
assert mesonpy._substitutions.interpolate('%(x * 2 + 3 - 4 / 1)d', {'x': 1}) == '1'


def test_interpolate_key_error():
with pytest.raises(ValueError, match='unknown variable "y"'):
mesonpy._substitutions.interpolate('%(y)d', {'x': 1})


def test_interpolate_not_implemented():
with pytest.raises(ValueError, match='invalid expression'):
mesonpy._substitutions.interpolate('%(x ** 2)d', {'x': 1})


def test_substitutions(package_substitutions, monkeypatch):
monkeypatch.setattr(mesonpy._substitutions, '_ncores', lambda: 2)
with mesonpy._project() as project:
assert project._meson_args['compile'] == ['-j', '3']


def test_substitutions_invalid(package_substitutions_invalid, monkeypatch):
monkeypatch.setattr(mesonpy._substitutions, '_ncores', lambda: 2)
with pytest.raises(mesonpy.ConfigError, match=''):
with mesonpy._project():
pass

0 comments on commit 58bba11

Please sign in to comment.