From 7a25882d5733bee50cfe307d875437d98e58d442 Mon Sep 17 00:00:00 2001 From: Siarhei Siniak Date: Thu, 8 May 2025 16:54:31 +0300 Subject: [PATCH] [+] add pip check conflicts into cli_bootstrap --- .../fxreader/pr34/commands_typed/cli_bootstrap.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py b/python/online/fxreader/pr34/commands_typed/cli_bootstrap.py index efeee7a..12c7863 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 json import io import tempfile import dataclasses @@ -169,6 +170,12 @@ class BootstrapSettings: ), ).strip() ) + pip_check_conflicts: Optional[bool] = dataclasses.field( + default_factory=lambda : os.environ.get( + 'PIP_CHECK_CONFLICTS', + json.dumps(True) + ) in [json.dumps(True)], + ) uv_args: list[str] = dataclasses.field( default_factory=lambda : os.environ.get( 'UV_ARGS', @@ -309,6 +316,13 @@ def env_bootstrap( '-r', str(requirements_path), ]) + if bootstrap_settings.pip_check_conflicts: + subprocess.check_call([ + bootstrap_settings.python_path, + '-m', + 'online.fxreader.pr34.commands', + 'pip_check_conflicts', + ]) def paths_equal( a: pathlib.Path | str,