From 4e121ef25c21a8caaca8304cc683e382cacd48f4 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:31:39 +0000
Subject: [PATCH 01/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/asottile/pyupgrade: v3.15.1 → v3.15.2](https://github.com/asottile/pyupgrade/compare/v3.15.1...v3.15.2)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8a0ad8d7c..9cd3b47bb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,7 +24,7 @@ repos:
     hooks:
     -   id: add-trailing-comma
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.1
+    rev: v3.15.2
     hooks:
     -   id: pyupgrade
         args: [--py39-plus]

From 74d05b444de75367eaf630e099f15aa51e060dc1 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 22:08:29 +0000
Subject: [PATCH 02/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.5.0...v4.6.0)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9cd3b47bb..93f70f871 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer

From 0d4c6da36e96443f05ae2d1f6c4e63d1a5d2b652 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Mon, 29 Apr 2024 21:05:41 -0400
Subject: [PATCH 03/17] adjust _handle_readonly for typeshed updates

---
 pre_commit/util.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pre_commit/util.py b/pre_commit/util.py
index b3682d4f7..b75c84a2d 100644
--- a/pre_commit/util.py
+++ b/pre_commit/util.py
@@ -205,10 +205,11 @@ def cmd_output_p(
 def _handle_readonly(
         func: Callable[[str], object],
         path: str,
-        exc: OSError,
+        exc: Exception,
 ) -> None:
     if (
             func in (os.rmdir, os.remove, os.unlink) and
+            isinstance(exc, OSError) and
             exc.errno in {errno.EACCES, errno.EPERM}
     ):
         for p in (path, os.path.dirname(path)):
@@ -222,7 +223,7 @@ def _handle_readonly(
     def _handle_readonly_old(
         func: Callable[[str], object],
         path: str,
-        excinfo: tuple[type[OSError], OSError, TracebackType],
+        excinfo: tuple[type[Exception], Exception, TracebackType],
     ) -> None:
         return _handle_readonly(func, path, excinfo[1])
 

From 5c3d006443d616f5b9a717a43a6f3bce60381ddf Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Mon, 29 Apr 2024 21:28:16 -0400
Subject: [PATCH 04/17] use a simpler gem for testing additional_dependencies

tins required building bigdecimal, whereas jmespath is self-contained
---
 tests/languages/ruby_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/languages/ruby_test.py b/tests/languages/ruby_test.py
index 6397a4347..5d767b25d 100644
--- a/tests/languages/ruby_test.py
+++ b/tests/languages/ruby_test.py
@@ -91,8 +91,8 @@ def test_ruby_additional_deps(tmp_path):
         tmp_path,
         ruby,
         'ruby -e',
-        args=('require "tins"',),
-        deps=('tins',),
+        args=('require "jmespath"',),
+        deps=('jmespath',),
     )
     assert ret == (0, b'')
 

From 0142f453224801138448584a8517927194865330 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 22:03:55 +0000
Subject: [PATCH 05/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/mirrors-mypy: v1.9.0 → v1.10.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.9.0...v1.10.0)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 93f70f871..6caee40d7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
     -   id: mypy
         additional_dependencies: [types-all]

From 296f59266ec656fe46bf0d1b2bce6aac89476476 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 10 May 2024 17:06:29 -0400
Subject: [PATCH 06/17] determine rust default language version independent of
 rust-toolchain.toml

---
 pre_commit/languages/rust.py | 2 +-
 tests/languages/rust_test.py | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pre_commit/languages/rust.py b/pre_commit/languages/rust.py
index 7b04d6c25..5f9db8fb7 100644
--- a/pre_commit/languages/rust.py
+++ b/pre_commit/languages/rust.py
@@ -34,7 +34,7 @@ def get_default_version() -> str:
     # Just detecting the executable does not suffice, because if rustup is
     # installed but no toolchain is available, then `cargo` exists but
     # cannot be used without installing a toolchain first.
-    if cmd_output_b('cargo', '--version', check=False)[0] == 0:
+    if cmd_output_b('cargo', '--version', check=False, cwd='/')[0] == 0:
         return 'system'
     else:
         return C.DEFAULT
diff --git a/tests/languages/rust_test.py b/tests/languages/rust_test.py
index 5c17f5b69..52e356134 100644
--- a/tests/languages/rust_test.py
+++ b/tests/languages/rust_test.py
@@ -9,6 +9,7 @@
 from pre_commit.languages import rust
 from pre_commit.store import _make_local_repo
 from testing.language_helpers import run_language
+from testing.util import cwd
 
 ACTUAL_GET_DEFAULT_VERSION = rust.get_default_version.__wrapped__
 
@@ -29,6 +30,14 @@ def test_uses_default_when_rust_is_not_available(cmd_output_b_mck):
     assert ACTUAL_GET_DEFAULT_VERSION() == C.DEFAULT
 
 
+def test_selects_system_even_if_rust_toolchain_toml(tmp_path):
+    toolchain_toml = '[toolchain]\nchannel = "wtf"\n'
+    tmp_path.joinpath('rust-toolchain.toml').write_text(toolchain_toml)
+
+    with cwd(tmp_path):
+        assert ACTUAL_GET_DEFAULT_VERSION() == 'system'
+
+
 def _make_hello_world(tmp_path):
     src_dir = tmp_path.joinpath('src')
     src_dir.mkdir()

From 9ee076835365c0b3aa700de8f574def623826385 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 10 May 2024 21:24:51 -0400
Subject: [PATCH 07/17] v3.7.1

---
 CHANGELOG.md | 9 +++++++++
 setup.cfg    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 076e16315..81d5b33e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+3.7.1 - 2024-05-10
+==================
+
+### Fixes
+- Fix `language: rust` default language version check when `rust-toolchain.toml`
+  is present.
+    - issue by @gaborbernat.
+    - #3201 PR by @asottile.
+
 3.7.0 - 2024-03-24
 ==================
 
diff --git a/setup.cfg b/setup.cfg
index 0e155601b..83c09acde 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pre_commit
-version = 3.7.0
+version = 3.7.1
 description = A framework for managing and maintaining multi-language pre-commit hooks.
 long_description = file: README.md
 long_description_content_type = text/markdown

From 5526bb21377dc3e4a59451a55d0d729644eac462 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 21:34:15 +0000
Subject: [PATCH 08/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/hhatto/autopep8: v2.1.0 → v2.1.1](https://github.com/hhatto/autopep8/compare/v2.1.0...v2.1.1)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6caee40d7..eebeea992 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,7 +29,7 @@ repos:
     -   id: pyupgrade
         args: [--py39-plus]
 -   repo: https://github.com/hhatto/autopep8
-    rev: v2.1.0
+    rev: v2.1.1
     hooks:
     -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8

From 1f128556e4ac2fae84133b9a4f085a8044a44382 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:47:18 +0000
Subject: [PATCH 09/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/asottile/reorder-python-imports: v3.12.0 → v3.13.0](https://github.com/asottile/reorder-python-imports/compare/v3.12.0...v3.13.0)
- [github.com/hhatto/autopep8: v2.1.1 → v2.2.0](https://github.com/hhatto/autopep8/compare/v2.1.1...v2.2.0)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index eebeea992..0467fa394 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
     hooks:
     -   id: setup-cfg-fmt
 -   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+    rev: v3.13.0
     hooks:
     -   id: reorder-python-imports
         exclude: ^(pre_commit/resources/|testing/resources/python3_hooks_repo/)
@@ -29,7 +29,7 @@ repos:
     -   id: pyupgrade
         args: [--py39-plus]
 -   repo: https://github.com/hhatto/autopep8
-    rev: v2.1.1
+    rev: v2.2.0
     hooks:
     -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8

From 9dd247898c86405b68705595d8a3c8911be39d57 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 21:56:51 +0000
Subject: [PATCH 10/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/asottile/pyupgrade: v3.15.2 → v3.16.0](https://github.com/asottile/pyupgrade/compare/v3.15.2...v3.16.0)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0467fa394..6282056f9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,7 +24,7 @@ repos:
     hooks:
     -   id: add-trailing-comma
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+    rev: v3.16.0
     hooks:
     -   id: pyupgrade
         args: [--py39-plus]

From 49a9664cd0e393fb3bc5e1023bee801cc3e6fc6a Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:57:20 +0000
Subject: [PATCH 11/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/hhatto/autopep8: v2.2.0 → v2.3.0](https://github.com/hhatto/autopep8/compare/v2.2.0...v2.3.0)
- [github.com/PyCQA/flake8: 7.0.0 → 7.1.0](https://github.com/PyCQA/flake8/compare/7.0.0...7.1.0)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6282056f9..b11a1dce2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,11 +29,11 @@ repos:
     -   id: pyupgrade
         args: [--py39-plus]
 -   repo: https://github.com/hhatto/autopep8
-    rev: v2.2.0
+    rev: v2.3.0
     hooks:
     -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.0
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy

From 69b5dce12ab0674cd7a622ca8b55f1afa720211b Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:49:02 +0000
Subject: [PATCH 12/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/hhatto/autopep8: v2.3.0 → v2.3.1](https://github.com/hhatto/autopep8/compare/v2.3.0...v2.3.1)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b11a1dce2..1f734f8cf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,7 +29,7 @@ repos:
     -   id: pyupgrade
         args: [--py39-plus]
 -   repo: https://github.com/hhatto/autopep8
-    rev: v2.3.0
+    rev: v2.3.1
     hooks:
     -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8

From f632459bc67834a200aac26f1129fc16f82fb625 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 23:34:14 +0000
Subject: [PATCH 13/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/mirrors-mypy: v1.10.0 → v1.10.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.10.0...v1.10.1)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1f734f8cf..f987dfe89 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.10.1
     hooks:
     -   id: mypy
         additional_dependencies: [types-all]

From 88317ddb34ac8c60b4be7e22198fb550dcae995e Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:04:19 +0000
Subject: [PATCH 14/17] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/mirrors-mypy: v1.10.1 → v1.11.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.10.1...v1.11.0)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f987dfe89..a628f4f47 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.1
+    rev: v1.11.0
     hooks:
     -   id: mypy
         additional_dependencies: [types-all]

From a68a19d217d0d1067828622fde9044d9502693b3 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sun, 28 Jul 2024 14:50:24 -0400
Subject: [PATCH 15/17] fixes for mypy 1.11

---
 .pre-commit-config.yaml |  2 +-
 pre_commit/util.py      |  4 ++--
 tests/conftest.py       | 25 +++++++------------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a628f4f47..1a9a8fef9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -40,5 +40,5 @@ repos:
     rev: v1.11.0
     hooks:
     -   id: mypy
-        additional_dependencies: [types-all]
+        additional_dependencies: [types-pyyaml]
         exclude: ^testing/resources/
diff --git a/pre_commit/util.py b/pre_commit/util.py
index b75c84a2d..12aa3c0e1 100644
--- a/pre_commit/util.py
+++ b/pre_commit/util.py
@@ -205,7 +205,7 @@ def cmd_output_p(
 def _handle_readonly(
         func: Callable[[str], object],
         path: str,
-        exc: Exception,
+        exc: BaseException,
 ) -> None:
     if (
             func in (os.rmdir, os.remove, os.unlink) and
@@ -223,7 +223,7 @@ def _handle_readonly(
     def _handle_readonly_old(
         func: Callable[[str], object],
         path: str,
-        excinfo: tuple[type[Exception], Exception, TracebackType],
+        excinfo: tuple[type[BaseException], BaseException, TracebackType],
     ) -> None:
         return _handle_readonly(func, path, excinfo[1])
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 30761715b..bd4af9a52 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -209,36 +209,25 @@ def log_info_mock():
         yield mck
 
 
-class FakeStream:
-    def __init__(self):
-        self.data = io.BytesIO()
-
-    def write(self, s):
-        self.data.write(s)
-
-    def flush(self):
-        pass
-
-
 class Fixture:
-    def __init__(self, stream):
+    def __init__(self, stream: io.BytesIO) -> None:
         self._stream = stream
 
-    def get_bytes(self):
+    def get_bytes(self) -> bytes:
         """Get the output as-if no encoding occurred"""
-        data = self._stream.data.getvalue()
-        self._stream.data.seek(0)
-        self._stream.data.truncate()
+        data = self._stream.getvalue()
+        self._stream.seek(0)
+        self._stream.truncate()
         return data.replace(b'\r\n', b'\n')
 
-    def get(self):
+    def get(self) -> str:
         """Get the output assuming it was written as UTF-8 bytes"""
         return self.get_bytes().decode()
 
 
 @pytest.fixture
 def cap_out():
-    stream = FakeStream()
+    stream = io.BytesIO()
     write = functools.partial(output.write, stream=stream)
     write_line_b = functools.partial(output.write_line_b, stream=stream)
     with mock.patch.multiple(output, write=write, write_line_b=write_line_b):

From da0c1d0cfa19f6dc0d6ed97820c7cc93fe7e7c58 Mon Sep 17 00:00:00 2001
From: Lorenz Walthert <lorenzwalthert@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:52:43 +0200
Subject: [PATCH 16/17] implement health check for language:r

---
 pre_commit/languages/r.py |  77 +++++++++++++++++++++++++----
 tests/languages/r_test.py | 100 +++++++++++++++++++++++++++++++++-----
 2 files changed, 155 insertions(+), 22 deletions(-)

diff --git a/pre_commit/languages/r.py b/pre_commit/languages/r.py
index 93b62bd53..5d18bf1cb 100644
--- a/pre_commit/languages/r.py
+++ b/pre_commit/languages/r.py
@@ -14,13 +14,74 @@
 from pre_commit.envcontext import PatchesT
 from pre_commit.envcontext import UNSET
 from pre_commit.prefix import Prefix
+from pre_commit.util import cmd_output
 from pre_commit.util import cmd_output_b
 from pre_commit.util import win_exe
 
 ENVIRONMENT_DIR = 'renv'
 RSCRIPT_OPTS = ('--no-save', '--no-restore', '--no-site-file', '--no-environ')
 get_default_version = lang_base.basic_get_default_version
-health_check = lang_base.basic_health_check
+
+
+def _execute_vanilla_r_code_as_script(
+        code: str, *,
+        prefix: Prefix, version: str, args: Sequence[str] = (), cwd: str,
+) -> str:
+    with in_env(prefix, version), _r_code_in_tempfile(code) as f:
+        _, out, _ = cmd_output(
+            _rscript_exec(), *RSCRIPT_OPTS, f, *args, cwd=cwd,
+        )
+    return out.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())',
+        prefix=prefix, version=version,
+        cwd=envdir,
+    )
+
+
+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, 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, prefix=prefix, version=version,
+    )
+    r_version_current_executable = _read_executable_version(
+        envdir=envdir, prefix=prefix, version=version,
+    )
+    if r_version_installation in {'NULL', ''}:
+        return (
+            f'Hooks were installed with an unknown R version. R version for '
+            f'hook repo now set to {r_version_current_executable}'
+        )
+    elif r_version_installation != r_version_current_executable:
+        return (
+            f'Hooks were installed for R version {r_version_installation}, '
+            f'but current R executable has version '
+            f'{r_version_current_executable}'
+        )
+
+    return None
 
 
 @contextlib.contextmanager
@@ -147,16 +208,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, 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,
+            args=additional_dependencies,
+            cwd=env_dir,
+        )
 
 
 def _inline_r_setup(code: str) -> str:
diff --git a/tests/languages/r_test.py b/tests/languages/r_test.py
index 02c559cb4..10919e4a7 100644
--- a/tests/languages/r_test.py
+++ b/tests/languages/r_test.py
@@ -1,14 +1,17 @@
 from __future__ import annotations
 
 import os.path
-import shutil
+from unittest import mock
 
 import pytest
 
+import pre_commit.constants as C
 from pre_commit import envcontext
+from pre_commit import lang_base
 from pre_commit.languages import r
 from pre_commit.prefix import Prefix
 from pre_commit.store import _make_local_repo
+from pre_commit.util import resource_text
 from pre_commit.util import win_exe
 from testing.language_helpers import run_language
 
@@ -127,7 +130,8 @@ def test_path_rscript_exec_no_r_home_set():
         assert r._rscript_exec() == 'Rscript'
 
 
-def test_r_hook(tmp_path):
+@pytest.fixture
+def renv_lock_file(tmp_path):
     renv_lock = '''\
 {
   "R": {
@@ -157,6 +161,12 @@ def test_r_hook(tmp_path):
   }
 }
 '''
+    tmp_path.joinpath('renv.lock').write_text(renv_lock)
+    yield
+
+
+@pytest.fixture
+def description_file(tmp_path):
     description = '''\
 Package: gli.clu
 Title: What the Package Does (One Line, Title Case)
@@ -178,27 +188,39 @@ def test_r_hook(tmp_path):
 Imports:
     rprojroot
 '''
-    hello_world_r = '''\
+    tmp_path.joinpath('DESCRIPTION').write_text(description)
+    yield
+
+
+@pytest.fixture
+def hello_world_file(tmp_path):
+    hello_world = '''\
 stopifnot(
     packageVersion('rprojroot') == '1.0',
     packageVersion('gli.clu') == '0.0.0.9000'
 )
 cat("Hello, World, from R!\n")
 '''
+    tmp_path.joinpath('hello-world.R').write_text(hello_world)
+    yield
 
-    tmp_path.joinpath('renv.lock').write_text(renv_lock)
-    tmp_path.joinpath('DESCRIPTION').write_text(description)
-    tmp_path.joinpath('hello-world.R').write_text(hello_world_r)
+
+@pytest.fixture
+def renv_folder(tmp_path):
     renv_dir = tmp_path.joinpath('renv')
     renv_dir.mkdir()
-    shutil.copy(
-        os.path.join(
-            os.path.dirname(__file__),
-            '../../pre_commit/resources/empty_template_activate.R',
-        ),
-        renv_dir.joinpath('activate.R'),
-    )
+    activate_r = resource_text('empty_template_activate.R')
+    renv_dir.joinpath('activate.R').write_text(activate_r)
+    yield
+
 
+def test_r_hook(
+        tmp_path,
+        renv_lock_file,
+        description_file,
+        hello_world_file,
+        renv_folder,
+):
     expected = (0, b'Hello, World, from R!\n')
     assert run_language(tmp_path, r, 'Rscript hello-world.R') == expected
 
@@ -221,3 +243,55 @@ def test_r_inline(tmp_path):
         args=('hi', 'hello'),
     )
     assert ret == (0, b'hi, hello, from R!\n')
+
+
+@pytest.fixture
+def prefix(tmpdir):
+    yield Prefix(str(tmpdir))
+
+
+@pytest.fixture
+def installed_environment(
+        renv_lock_file,
+        hello_world_file,
+        renv_folder,
+        prefix,
+):
+    env_dir = lang_base.environment_dir(
+        prefix, r.ENVIRONMENT_DIR, r.get_default_version(),
+    )
+    r.install_environment(prefix, C.DEFAULT, ())
+    yield prefix, env_dir
+
+
+def test_health_check_healthy(installed_environment):
+    # should be healthy right after creation
+    prefix, _ = installed_environment
+    assert r.health_check(prefix, C.DEFAULT) is None
+
+
+def test_health_check_after_downgrade(installed_environment):
+    prefix, _ = installed_environment
+
+    # pretend the saved installed version is old
+    with mock.patch.object(r, '_read_installed_version', return_value='1.0.0'):
+        output = r.health_check(prefix, C.DEFAULT)
+
+    assert output is not None
+    assert output.startswith('Hooks were installed for R version')
+
+
+@pytest.mark.parametrize('version', ('NULL', 'NA', "''"))
+def test_health_check_without_version(prefix, installed_environment, version):
+    prefix, env_dir = installed_environment
+
+    # simulate old pre-commit install by unsetting the installed version
+    r._execute_vanilla_r_code_as_script(
+        f'renv::settings$r.version({version})',
+        prefix=prefix, version=C.DEFAULT, cwd=env_dir,
+    )
+
+    # no R version specified fails as unhealty
+    msg = 'Hooks were installed with an unknown R version'
+    check_output = r.health_check(prefix, C.DEFAULT)
+    assert check_output is not None and check_output.startswith(msg)

From d46423ffe14a37a06a0bcb6fe1b8294a27b6c289 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sun, 28 Jul 2024 15:58:29 -0400
Subject: [PATCH 17/17] v3.8.0

---
 CHANGELOG.md | 9 +++++++++
 setup.cfg    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81d5b33e8..49094bbb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+3.8.0 - 2024-07-28
+==================
+
+### Features
+- Implement health checks for `language: r` so environments are recreated if
+  the system version of R changes.
+    - #3206 issue by @lorenzwalthert.
+    - #3265 PR by @lorenzwalthert.
+
 3.7.1 - 2024-05-10
 ==================
 
diff --git a/setup.cfg b/setup.cfg
index 83c09acde..52b7681ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pre_commit
-version = 3.7.1
+version = 3.8.0
 description = A framework for managing and maintaining multi-language pre-commit hooks.
 long_description = file: README.md
 long_description_content_type = text/markdown