never rely on global renv installation, execute all code in renv

lorenzwalthert · lorenzwalthert · commit 1445ac63e17a · 2024-07-23T21:59:34.000+02:00
diff --git a/pre_commit/languages/r.py b/pre_commit/languages/r.py
@@ -23,37 +23,53 @@
 get_default_version = lang_base.basic_get_default_version
 
 
-def _execute_vanilla_r_code_as_script(code: str, **kwargs: Any) -> str:
-    with _r_code_in_tempfile(code) as f:
-        cmd_out = cmd_output_b(_rscript_exec(), '--vanilla', f, **kwargs)
-    return cmd_out[1].decode().rstrip('\n')
-
-
-def _read_installed_version(envdir: str) -> str:
+def _execute_vanilla_r_code_as_script(
+        code: str, prefix: Prefix, version: str, args: Sequence[str] = (), 
+        **kwargs: Any,
+) -> str:
+    with in_env(prefix, version):
+        with _r_code_in_tempfile(code) as f:
+            cmd_out = cmd_output_b(
+                _rscript_exec(), *RSCRIPT_OPTS, f, *args, **kwargs,
+            )
+        return cmd_out[1].decode().rstrip('\n')
+
+
+def _read_installed_version(envdir: str, prefix: Prefix, version: str) -> str:
     return _execute_vanilla_r_code_as_script(
-        'cat(renv::settings$r.version())', cwd=envdir,
+        'cat(renv::settings$r.version())',
+        prefix=prefix, version=version,
+        cwd=envdir,
     )
 
 
-def _read_executable_version(envdir: str) -> str:
+def _read_executable_version(envdir: str, prefix: Prefix, version: str) -> str:
     return _execute_vanilla_r_code_as_script(
         'cat(as.character(getRversion()))',
+        prefix=prefix, version=version,
         cwd=envdir,
     )
 
 
-def _write_current_r_version(envdir: str) -> None:
+def _write_current_r_version(
+        envdir: str, prefix: Prefix, version: str,
+) -> None:
     _execute_vanilla_r_code_as_script(
         'renv::settings$r.version(as.character(getRversion()))',
+        prefix=prefix, version=version,
         cwd=envdir,
     )
 
 
 def health_check(prefix: Prefix, version: str) -> str | None:
     envdir = lang_base.environment_dir(prefix, ENVIRONMENT_DIR, version)
 
-    r_version_installation = _read_installed_version(envdir=envdir)
-    r_version_current_executable = _read_executable_version(envdir=envdir)
+    r_version_installation = _read_installed_version(
+        envdir=envdir, prefix=prefix, version=version,
+    )
+    r_version_current_executable = _read_executable_version(
+        envdir=envdir, prefix=prefix, version=version,
+    )
     if r_version_installation in {'NULL', ''}:
         return (
             'Hooks were installed with an unknown R version. R version for '
@@ -193,17 +209,14 @@ def install_environment(
     with _r_code_in_tempfile(r_code_inst_environment) as f:
         cmd_output_b(_rscript_exec(), '--vanilla', f, cwd=env_dir)
 
-    _write_current_r_version(envdir=env_dir)
+    _write_current_r_version(envdir=env_dir, prefix=prefix, version=version)
     if additional_dependencies:
         r_code_inst_add = 'renv::install(commandArgs(trailingOnly = TRUE))'
-        with in_env(prefix, version):
-            with _r_code_in_tempfile(r_code_inst_add) as f:
-                cmd_output_b(
-                    _rscript_exec(), *RSCRIPT_OPTS,
-                    f,
-                    *additional_dependencies,
-                    cwd=env_dir,
-                )
+        _execute_vanilla_r_code_as_script(
+            code=r_code_inst_add, prefix=prefix, version=version,
+            cwd=env_dir,
+            args=additional_dependencies,
+        )
 
 
 def _inline_r_setup(code: str) -> str:
diff --git a/tests/languages/r_test.py b/tests/languages/r_test.py
@@ -280,7 +280,8 @@ def installed_environment(
 @pytest.fixture
 def older_r_version():
     with mock.patch.object(
-        r, '_read_installed_version', lambda envdir: '1.0.0',
+        r, '_read_installed_version',
+        lambda envdir, prefix, version: '1.0.0',
     ):
         yield
 
@@ -300,9 +301,10 @@ def test_health_check_after_downgrade(installed_environment, older_r_version):
 
 @pytest.fixture(params=('NULL', 'NA', "''"))
 def installed_env_without_r_version_info(request, installed_environment):
-    _, env_dir = installed_environment
+    prefix, env_dir = installed_environment
     r._execute_vanilla_r_code_as_script(
         f'renv::settings$r.version({request.param})', cwd=env_dir,
+        prefix=prefix, version=C.DEFAULT,
     )
     yield
 
