git/pre-commit
1
0
Fork 0
Code Issues Activity

Adding upstream version 2.11.1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 21:25:57 +01:00
parent 0c77307851
commit 3faf89852c
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pre_commit/languages/r.py
View file

@ -88,13 +88,11 @@ def install_environment(
env_dir = _get_env_dir(prefix, version)
with clean_path_on_failure(env_dir):
os.makedirs(env_dir, exist_ok=True)
path_desc_source = prefix.path('DESCRIPTION')
if os.path.exists(path_desc_source):
shutil.copy(path_desc_source, env_dir)
shutil.copy(prefix.path('renv.lock'), env_dir)
cmd_output_b(
'Rscript', '--vanilla', '-e',
"""\
f"""\
prefix_dir <- {prefix.prefix_dir!r}
missing_pkgs <- setdiff(
"renv", unname(installed.packages()[, "Package"])
)
@ -109,15 +107,15 @@ def install_environment(
'renv::activate("', file.path(getwd()), '"); '
)
writeLines(activate_statement, 'activate.R')
is_package <- tryCatch(
suppressWarnings(
unname(read.dcf('DESCRIPTION')[,'Type'] == "Package")
),
is_package <- tryCatch({{
content_desc <- read.dcf(file.path(prefix_dir, 'DESCRIPTION'))
suppressWarnings(unname(content_desc[,'Type']) == "Package")
}},
error = function(...) FALSE
)
if (is_package) {
renv::install(normalizePath('.'))
}
if (is_package) {{
renv::install(prefix_dir)
}}
""",
cwd=env_dir,
)