diff --git a/python/meson.build b/python/meson.build index d06744f..15bf5a2 100644 --- a/python/meson.build +++ b/python/meson.build @@ -5,7 +5,7 @@ project( ).stdout().strip('\n'), # 'online.fxreader.uv', # ['c', 'cpp'], - version: '0.1.5.17+27.2', + version: '0.1.5.17+27.3', # default_options: [ # 'cpp_std=c++23', # # 'prefer_static=true', diff --git a/python/online/fxreader/pr34/commands_typed/cli.py b/python/online/fxreader/pr34/commands_typed/cli.py index 87730c0..f772b36 100644 --- a/python/online/fxreader/pr34/commands_typed/cli.py +++ b/python/online/fxreader/pr34/commands_typed/cli.py @@ -421,10 +421,13 @@ class CLI(abc.ABC): argv = pyproject_tool.meson.args.install + argv cmd = [ - shutil_which( - 'meson', - True, - ), + str(self.dist_settings.python_path), + '-m', + 'mesonbuild.mesonmain', + # shutil_which( + # 'meson', + # True, + # ), 'install', '-C', str(project.build_dir / 'meson'), @@ -496,10 +499,12 @@ class CLI(abc.ABC): subprocess.check_call( [ - shutil_which( - 'meson', - True, - ), + str(self.dist_settings.python_path), + 'mesonbuild.mesonmain', + # shutil_which( + # 'meson', + # True, + # ), 'test', '-C', project.build_dir / 'meson', @@ -519,10 +524,13 @@ class CLI(abc.ABC): subprocess.check_call( [ - shutil_which( - 'meson', - True, - ), + str(self.dist_settings.python_path), + '-m', + 'mesonbuild.mesonmain', + # shutil_which( + # 'meson', + # True, + # ), 'compile', '-C', project.build_dir / 'meson', @@ -572,10 +580,13 @@ class CLI(abc.ABC): extra_args = pyproject_tool.meson.args.setup + extra_args cmd = [ - shutil_which( - 'meson', - True, - ), + # shutil_which( + # 'meson', + # True, + # ), + str(self.dist_settings.python_path), + '-m', + 'mesonbuild.mesonmain', 'setup', str(project.source_dir), str(project.build_dir / 'meson'), diff --git a/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py b/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py index 06f837e..90f53d1 100644 --- a/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py +++ b/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import glob +import importlib import json import io import tempfile @@ -18,6 +19,7 @@ from typing import ( cast, Type, TypeVar, + Callable, ) from typing_extensions import ( Self, @@ -30,17 +32,23 @@ logger = logging.getLogger(__name__) def toml_load(f: BinaryIO) -> Any: try: - import tomllib + tomllib = importlib.import_module('tomllib') - return tomllib.load(f) - except: + return cast( + Callable[[Any], Any], + getattr( + tomllib, + 'load', + ), + )(f) + except ModuleNotFoundError: pass try: import tomli return tomli.load(f) - except: + except ModuleNotFoundError: pass raise NotImplementedError diff --git a/releases/whl/online_fxreader_pr34-0.1.5.17+27.3-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.17+27.3-py3-none-any.whl new file mode 100644 index 0000000..181406e --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.17+27.3-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:875a1e88e89bb839ce22c93a10b18c84fe48832c191157b70cac0d3857a88386 +size 69866