From dbd78f696f467a7cfdd28b3952900910c7eef09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20M=C3=BCller?= Date: Fri, 18 Oct 2024 17:10:50 +0200 Subject: [PATCH] enh: support passing pathlib.Path to lme4.rsetup.set_*_path methods --- CHANGELOG | 2 ++ dclab/lme4/rsetup.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index daa93ea1..0d55f307 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +0.62.6 + - enh: support passing pathlib.Path to lme4.rsetup.set_*_path methods 0.62.5 - enh: make set_r_lib_path available in lme4 submodule 0.62.4 diff --git a/dclab/lme4/rsetup.py b/dclab/lme4/rsetup.py index 8fd1a082..0ca031f0 100644 --- a/dclab/lme4/rsetup.py +++ b/dclab/lme4/rsetup.py @@ -187,13 +187,13 @@ def set_r_lib_path(r_lib_path): """Add given directory to the R_LIBS_USER environment variable""" paths = os.environ.get("R_LIBS_USER", "").split(os.pathsep) paths = [p for p in paths if p] - paths.append(r_lib_path.strip()) + paths.append(str(r_lib_path).strip()) os.environ["R_LIBS_USER"] = os.pathsep.join(list(set(paths))) def set_r_path(r_path): """Set the path of the R executable/binary""" - tmp = run_command((r_path, "RHOME")) + tmp = run_command((str(r_path), "RHOME")) r_home = tmp.split(os.linesep) if r_home[0].startswith("WARNING"):