From 4e8e80c4f276c0050b72c291c0fa8865560412e9 Mon Sep 17 00:00:00 2001 From: "Bradley A. Thornton" Date: Wed, 16 Aug 2023 16:57:17 -0700 Subject: [PATCH] Fix bindep --- src/pip4a/_version.py | 4 ++-- src/pip4a/installer.py | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/pip4a/_version.py b/src/pip4a/_version.py index 1d47388..cd0fa4c 100644 --- a/src/pip4a/_version.py +++ b/src/pip4a/_version.py @@ -1,4 +1,4 @@ # file generated by setuptools_scm # don't change, don't track in version control -__version__ = version = "0.1.dev18" -__version_tuple__ = version_tuple = (0, 1, "dev18") +__version__ = version = '0.1.dev24' +__version_tuple__ = version_tuple = (0, 1, 'dev24') diff --git a/src/pip4a/installer.py b/src/pip4a/installer.py index 742935d..61240bc 100644 --- a/src/pip4a/installer.py +++ b/src/pip4a/installer.py @@ -173,16 +173,16 @@ def _check_bindep(self: Installer) -> None: """Check the bindep file.""" bindep = Path("./bindep.txt").resolve() if not bindep.exists(): - msg = f"bindep file {bindep} does not exist, skipping" + msg = f"System package requirements file {bindep} does not exist, skipping" logger.info(msg) return msg = f"bindep file found: {bindep}" - logging.debug(msg) + logger.debug(msg) bindep_found = bool(shutil.which("bindep")) if not bindep_found: msg = "Installing bindep for: {bindep}" - logging.debug(msg) + logger.debug(msg) command = f"{sys.executable} -m pip install bindep" try: subprocess.run( @@ -193,11 +193,11 @@ def _check_bindep(self: Installer) -> None: ) except subprocess.CalledProcessError as exc: err = f"Failed to install bindep: {exc}" - logging.critical(err) + logger.critical(err) command = f"bindep -b -f {bindep}" msg = f"Running command: {command}" - logging.debug(msg) + logger.debug(msg) proc = subprocess.run( command, check=False, @@ -210,9 +210,10 @@ def _check_bindep(self: Installer) -> None: lines = proc.stdout.splitlines() msg = ( - "Required system packages are missing" - " please use the system package manager to install them." + "Required system packages are missing." + " Please use the system package manager to install them." ) - for line in lines[1:]: + logger.warning(msg) + for line in lines: msg = f"Missing: {line}" - logging.warning(msg) + logger.warning(msg)