diff --git a/Project.toml b/Project.toml index fdc60516a6c954f6d98de405298f9e4f81be9993..1999696f47504b82a4fb6a47022709e432d4976c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "TaggingBackends" uuid = "e551f703-3b82-4335-b341-d497b48d519b" authors = ["François Laurent", "Institut Pasteur"] -version = "0.18.2" +version = "0.19" [deps] Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" diff --git a/pyproject.toml b/pyproject.toml index 0a496d08f08f6b019f18ec1fd05bed8570701937..d32faa708e67a66cf0958a7601eb4a3b18734627 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "TaggingBackends" -version = "0.18.2" +version = "0.19" description = "Backbone for LarvaTagger.jl tagging backends" authors = ["François Laurent"] diff --git a/src/taggingbackends/explorer.py b/src/taggingbackends/explorer.py index 40644c839ee66ecd13b5d5aeea409fd236224085..f05f382062ebc5d941b29bfeba78dbe1fe42e637 100644 --- a/src/taggingbackends/explorer.py +++ b/src/taggingbackends/explorer.py @@ -201,7 +201,8 @@ Cannot find any Python package in project root directory: line = line[len(prefix):] if line.startswith("root:"): line = line[5:] - log(line.lstrip()) + line = '\n'.join(line.lstrip().split(r'\n')) + log(line) return # other Python warning messages from dependencies if line.startswith(" warn(") or line.startswith(" warnings.warn("): @@ -260,13 +261,16 @@ Cannot find any Python package in project root directory: lines = [] for line in msg.splitlines(): lines = self._parse_stdout(logger, lines, line) + if lines: + logger.info("\n".join(lines)) if ret.stderr: msg = ret.stderr.decode("utf-8") lines = [] for line in msg.splitlines(): self._parse_stderr(logger, lines, line) if lines: - raise Exception(f"in {path.name}:\n"+"\n".join(lines)) + msg = f"in {path.name}:\n"+"\n".join(lines) + raise Exception(msg) sys.stderr.flush() sys.stdout.flush() return ret