From 9a122a949db87fc5d92bff551bf7c7079adcd011 Mon Sep 17 00:00:00 2001 From: pwwang <1188067+pwwang@users.noreply.github.com> Date: Thu, 13 Apr 2023 18:47:19 -0700 Subject: [PATCH] 0.9.1 (#162) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Bump xqute to 0.2.1 * 🔖 0.9.1 --- docs/CHANGELOG.md | 4 ++++ pipen/defaults.py | 7 +++++++ pipen/proc.py | 1 - pipen/version.py | 2 +- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 377bc749..ec403219 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.9.1 + +- ⬆️ Bump xqute to 0.2.1 + ## 0.9.0 - ⬆️ Bump xqute to 0.2 so we can have slurm and ssh schedulers available diff --git a/pipen/defaults.py b/pipen/defaults.py index c2702862..c7014fb3 100644 --- a/pipen/defaults.py +++ b/pipen/defaults.py @@ -4,6 +4,13 @@ from diot import Diot from xqute import JobErrorStrategy +from xqute.utils import logger as xqute_logger + +# Remove the rich handler +_xqute_handlers = xqute_logger.handlers +if _xqute_handlers: + # The very first handler is the rich handler + xqute_logger.removeHandler(_xqute_handlers[0]) LOGGER_NAME = "main" CONFIG_FILES = ( diff --git a/pipen/proc.py b/pipen/proc.py index e958ef2d..51e55045 100644 --- a/pipen/proc.py +++ b/pipen/proc.py @@ -377,7 +377,6 @@ async def init(self) -> None: self.xqute = Xqute( self.scheduler, job_metadir=self.workdir, - loglevel="NOTSET", job_submission_batch=self.submission_batch, job_error_strategy=self.error_strategy or self.pipeline.config.error_strategy, diff --git a/pipen/version.py b/pipen/version.py index 760da9b4..f0a594f1 100644 --- a/pipen/version.py +++ b/pipen/version.py @@ -1,3 +1,3 @@ """Provide version of pipen""" -__version__ = "0.9.0" +__version__ = "0.9.1" diff --git a/poetry.lock b/poetry.lock index 4edc45f6..162d4997 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1062,14 +1062,14 @@ files = [ [[package]] name = "xqute" -version = "0.2.0" +version = "0.2.1" description = "A job management system for python" category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ - {file = "xqute-0.2.0-py3-none-any.whl", hash = "sha256:568a653841616fcdab5325522b110b5527ba1f4e686b7f33725db58f10a9d4bb"}, - {file = "xqute-0.2.0.tar.gz", hash = "sha256:097c3083444c130a08478f9e677ea253f0c2d46d353492c010a6222d64e6cf07"}, + {file = "xqute-0.2.1-py3-none-any.whl", hash = "sha256:41e78083870ffd07d7e37db2c440b31f8cb3f4d492f90f3d1c2e023bfd6fc587"}, + {file = "xqute-0.2.1.tar.gz", hash = "sha256:4c336389e600c657f9d97416fcb69b6fcb100a43f715ee73525ebf71c4d8b008"}, ] [package.dependencies] @@ -1085,4 +1085,4 @@ uvloop = ">=0,<1" [metadata] lock-version = "2.0" python-versions = "^3.8" # align with datar/pandas -content-hash = "e82cfb2863dc2089e8cdc3acd4149f3bd2bcb8d6fe5dbf2da7edf15fd13b4b05" +content-hash = "1f528038e232379ceb87d6bdfae0bb242c13f5090df92c3ef723e2819e8cff41" diff --git a/pyproject.toml b/pyproject.toml index b092a909..0a8c199f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api" [tool.poetry] name = "pipen" -version = "0.9.0" +version = "0.9.1" description = "A pipeline framework for python" authors = [ "pwwang ",] license = "MIT" @@ -21,7 +21,7 @@ liquidpy = "^0.8" pandas = "^1.4" enlighten = "^1" argx = "^0.2" -xqute = "^0.2" +xqute = "^0.2.1" ## included in xqute # rich = "^12" # diot = "^0.1"