8000 Merge pull request #26248 from HaoZeke/robustTemplateMeson · numpy/numpy@148db64 · GitHub
[go: up one dir, main page]
Skip to content

Commit 148db64

Browse files
sebergseberg
authored
Merge pull request #26248 from HaoZeke/robustTemplateMeson
MAINT,BUG: Robust string meson template substitution
2 parents 6ecfb44 + b0df150 commit 148db64

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎numpy/f2py/_backends/_meson.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ def initialize_template(self) -> None:
7373
self.substitutions["python"] = self.python_exe
7474

7575
def sources_substitution(self) -> None:
76-
self.substitutions["source_list"] = f",\n{self.indent}".join(
77-
[f"{self.indent}'{source}'," for source in self.sources]
76+
self.substitutions["source_list"] = ",\n".join(
77+
[f"{self.indent}'''{source}'''," for source in self.sources]
7878
)
7979

8080
def deps_substitution(self) -> None:
@@ -85,7 +85,7 @@ def deps_substitution(self) -> None:
8585
def libraries_substitution(self) -> None:
8686
self.substitutions["lib_dir_declarations"] = "\n".join(
8787
[
88-
f"lib_dir_{i} = declare_dependency(link_args : ['-L{lib_dir}'])"
88+
f"lib_dir_{i} = declare_dependency(link_args : ['''-L{lib_dir}'''])"
8989
for i, lib_dir in enumerate(self.library_dirs)
9090
]
9191
)
@@ -106,15 +106,15 @@ def libraries_substitution(self) -> None:
106106

107107
def include_substitution(self) -> None:
108108
self.substitutions["inc_list"] = f",\n{self.indent}".join(
109-
[f"{self.indent}'{inc}'," for inc in self.include_dirs]
109+
[f"{self.indent}'''{inc}'''," for inc in self.include_dirs]
110110
)
111111

112112
def generate_meson_build(self):
113113
for node in self.pipeline:
114114
node()
115115
template = Template(self.meson_build_template())
116116
meson_build = template.substitute(self.substitutions)
117-
meson_build = re.sub(r',,', ',', meson_build)
117+
meson_build = re.sub(r",,", ",", meson_build)
118118
return meson_build
119119

120120

‎numpy/f2py/_backends/meson.build.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project('${modulename}',
88
])
99
fc = meson.get_compiler('fortran')
1010

11-
py = import('python').find_installation('${python}', pure: false)
11+
py = import('python').find_installation('''${python}''', pure: false)
1212
py_dep = py.dependency()
1313

1414
incdir_numpy = run_command(py,

0 commit comments

Comments
 (0)
0