From 520ea4211a7b74675e6ad2597ed3eaf03b44ae8b Mon Sep 17 00:00:00 2001 From: Siarhei Siniak Date: Thu, 5 Jun 2025 11:55:45 +0300 Subject: [PATCH] [+] improve commands_typed 1. improve third_party_roots from pyproject; 2. improve typing for pip; --- python/meson.build | 2 +- .../pr34/commands_typed/cli_bootstrap.py | 29 +++++++++++++++---- .../fxreader/pr34/commands_typed/pip.py | 2 +- ...eader_pr34-0.1.5.17+27.15-py3-none-any.whl | 3 ++ ...eader_pr34-0.1.5.17+27.16-py3-none-any.whl | 3 ++ ...eader_pr34-0.1.5.17+27.17-py3-none-any.whl | 3 ++ 6 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 releases/whl/online_fxreader_pr34-0.1.5.17+27.15-py3-none-any.whl create mode 100644 releases/whl/online_fxreader_pr34-0.1.5.17+27.16-py3-none-any.whl create mode 100644 releases/whl/online_fxreader_pr34-0.1.5.17+27.17-py3-none-any.whl diff --git a/python/meson.build b/python/meson.build index ecaf2d6..07bb7c0 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.14', + version: '0.1.5.17+27.17', # default_options: [ # 'cpp_std=c++23', # # 'prefer_static=true', diff --git a/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py b/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py index 222b78f..2ac1f1d 100644 --- a/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py +++ b/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py @@ -68,6 +68,9 @@ class PyProject: pip_find_links: Optional[list[pathlib.Path]] = None runtime_libdirs: Optional[list[pathlib.Path]] = None runtime_preload: Optional[list[pathlib.Path]] = None + third_party_roots: list[str] = dataclasses.field( + default_factory=lambda: [], + ) requirements: dict[str, pathlib.Path] = dataclasses.field(default_factory=lambda: dict()) modules: list[Module] = dataclasses.field( @@ -227,14 +230,21 @@ def pyproject_load( res.runtime_libdirs = [ d.parent / pathlib.Path(o) # pathlib.Path(o) - for o in pr34_tool['runtime_libdirs'] + for o in check_list(pr34_tool['runtime_libdirs'], str) ] if 'runtime_preload' in pr34_tool: res.runtime_preload = [ d.parent / pathlib.Path(o) # pathlib.Path(o) - for o in pr34_tool['runtime_preload'] + for o in check_list(pr34_tool['runtime_preload'], str) + ] + + if 'third_party_roots' in pr34_tool: + res.third_party_roots = [ + o + # pathlib.Path(o) + for o in check_list(pr34_tool['third_party_roots'], str) ] if 'requirements' in pr34_tool: @@ -423,11 +433,20 @@ def env_bootstrap( # ]) uv_python_version: list[str] = [] + venv_python_version: list[str] = [] if not bootstrap_settings.python_version is None: uv_python_version.extend( + [ + # '-p', + '--python-version', + bootstrap_settings.python_version, + ] + ) + venv_python_version.extend( [ '-p', + # '--python-version', bootstrap_settings.python_version, ] ) @@ -462,7 +481,7 @@ def env_bootstrap( [ 'uv', 'venv', - *uv_python_version, + *venv_python_version, *pip_find_links_args, # '--seed', *bootstrap_settings.uv_args, @@ -477,8 +496,8 @@ def env_bootstrap( 'install', *uv_python_version, *pip_find_links_args, - # '-p', - # bootstrap_settings.python_path, + '-p', + bootstrap_settings.python_path, '--require-hashes', *bootstrap_settings.uv_args, '-r', diff --git a/python/online/fxreader/pr34/commands_typed/pip.py b/python/online/fxreader/pr34/commands_typed/pip.py index 543e1e2..c958fb9 100644 --- a/python/online/fxreader/pr34/commands_typed/pip.py +++ b/python/online/fxreader/pr34/commands_typed/pip.py @@ -43,7 +43,7 @@ logger = logging.getLogger(__name__) class pip_show_t: class res_t: class package_info_t: - pass + location: str def pip_show( diff --git a/releases/whl/online_fxreader_pr34-0.1.5.17+27.15-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.17+27.15-py3-none-any.whl new file mode 100644 index 0000000..fd46bc6 --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.17+27.15-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:206847a151f9990f3765df0930dcfaef11e295e94336e2293c4ca6bb8e40bdfc +size 70941 diff --git a/releases/whl/online_fxreader_pr34-0.1.5.17+27.16-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.17+27.16-py3-none-any.whl new file mode 100644 index 0000000..1963866 --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.17+27.16-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8132aac370f677eb45ea1a67a16a758438595ae78feb3cbe946f36ae95684c56 +size 70970 diff --git a/releases/whl/online_fxreader_pr34-0.1.5.17+27.17-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.17+27.17-py3-none-any.whl new file mode 100644 index 0000000..9258aa3 --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.17+27.17-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9b546f6809d1d8a2bebd46491f678a42d20a5e85166b7cdfe4bcc37323e3ed1 +size 70969