rename r to renv

azure-pipelines.yml

@@ -28,8 +28,8 @@ jobs:
       displayName: Add strawberry perl to PATH
     - task: PowerShell@2
       inputs:
-        filePath: "testing/get-renv.ps1"
-      displayName: install R (for language renv)
+        filePath: "testing/get-r.ps1"
+      displayName: install R
 - template: job--python-tox.yml@asottile
   parameters:
     toxenvs: [py37]
@@ -47,8 +47,8 @@ jobs:
         echo '##vso[task.prependpath]/tmp/swift/usr/bin'
       displayName: install swift
     - bash: |
-        testing/get-renv.sh
-      displayName: install R (for language renv)
+        testing/get-r.sh
+      displayName: install R
 - template: job--python-tox.yml@asottile
   parameters:
     toxenvs: [pypy3, py36, py37, py38, py39]
@@ -64,5 +64,5 @@ jobs:
         echo '##vso[task.prependpath]/tmp/swift/usr/bin'
       displayName: install swift
     - bash: |
-        testing/get-renv.sh
-      displayName: install R (for language renv)
+        testing/get-r.sh
+      displayName: install R

pre_commit/languages/all.py

@@ -16,7 +16,7 @@
 from pre_commit.languages import perl
 from pre_commit.languages import pygrep
 from pre_commit.languages import python
-from pre_commit.languages import renv
+from pre_commit.languages import r
 from pre_commit.languages import ruby
 from pre_commit.languages import rust
 from pre_commit.languages import script
@@ -41,19 +41,19 @@ class Language(NamedTuple):
 
 # TODO: back to modules + Protocol: https://github.com/python/mypy/issues/5018
 languages = {
-    # BEGIN GENERATED (testing/gen-languages-all)
+    # BEGIN GENERATED (./testing/gen-languages-all)
     'conda': Language(name='conda', ENVIRONMENT_DIR=conda.ENVIRONMENT_DIR, get_default_version=conda.get_default_version, healthy=conda.healthy, install_environment=conda.install_environment, run_hook=conda.run_hook),  # noqa: E501
     'coursier': Language(name='coursier', ENVIRONMENT_DIR=coursier.ENVIRONMENT_DIR, get_default_version=coursier.get_default_version, healthy=coursier.healthy, install_environment=coursier.install_environment, run_hook=coursier.run_hook),  # noqa: E501
     'docker': Language(name='docker', ENVIRONMENT_DIR=docker.ENVIRONMENT_DIR, get_default_version=docker.get_default_version, healthy=docker.healthy, install_environment=docker.install_environment, run_hook=docker.run_hook),  # noqa: E501
-    'docker_image': Language(name='docker_image', ENVIRONMENT_DIR=docker_image.ENVIRONMENT_DIR, get_default_version=docker_image.get_default_version, healthy=docker_image.healthy, install_environment=docker_image.install_environment, run_hook=docker_image.run_hook),  # noqa: E501
     'dotnet': Language(name='dotnet', ENVIRONMENT_DIR=dotnet.ENVIRONMENT_DIR, get_default_version=dotnet.get_default_version, healthy=dotnet.healthy, install_environment=dotnet.install_environment, run_hook=dotnet.run_hook),  # noqa: E501
+    'docker_image': Language(name='docker_image', ENVIRONMENT_DIR=docker_image.ENVIRONMENT_DIR, get_default_version=docker_image.get_default_version, healthy=docker_image.healthy, install_environment=docker_image.install_environment, run_hook=docker_image.run_hook),  # noqa: E501
     'fail': Language(name='fail', ENVIRONMENT_DIR=fail.ENVIRONMENT_DIR, get_default_version=fail.get_default_version, healthy=fail.healthy, install_environment=fail.install_environment, run_hook=fail.run_hook),  # noqa: E501
     'golang': Language(name='golang', ENVIRONMENT_DIR=golang.ENVIRONMENT_DIR, get_default_version=golang.get_default_version, healthy=golang.healthy, install_environment=golang.install_environment, run_hook=golang.run_hook),  # noqa: E501
     'node': Language(name='node', ENVIRONMENT_DIR=node.ENVIRONMENT_DIR, get_default_version=node.get_default_version, healthy=node.healthy, install_environment=node.install_environment, run_hook=node.run_hook),  # noqa: E501
     'perl': Language(name='perl', ENVIRONMENT_DIR=perl.ENVIRONMENT_DIR, get_default_version=perl.get_default_version, healthy=perl.healthy, install_environment=perl.install_environment, run_hook=perl.run_hook),  # noqa: E501
     'pygrep': Language(name='pygrep', ENVIRONMENT_DIR=pygrep.ENVIRONMENT_DIR, get_default_version=pygrep.get_default_version, healthy=pygrep.healthy, install_environment=pygrep.install_environment, run_hook=pygrep.run_hook),  # noqa: E501
     'python': Language(name='python', ENVIRONMENT_DIR=python.ENVIRONMENT_DIR, get_default_version=python.get_default_version, healthy=python.healthy, install_environment=python.install_environment, run_hook=python.run_hook),  # noqa: E501
-    'renv': Language(name='renv', ENVIRONMENT_DIR=renv.ENVIRONMENT_DIR, get_default_version=renv.get_default_version, healthy=renv.healthy, install_environment=renv.install_environment, run_hook=renv.run_hook),  # noqa: E501
+    'r': Language(name='r', ENVIRONMENT_DIR=r.ENVIRONMENT_DIR, get_default_version=r.get_default_version, healthy=r.healthy, install_environment=r.install_environment, run_hook=r.run_hook),  # noqa: E501
     'ruby': Language(name='ruby', ENVIRONMENT_DIR=ruby.ENVIRONMENT_DIR, get_default_version=ruby.get_default_version, healthy=ruby.healthy, install_environment=ruby.install_environment, run_hook=ruby.run_hook),  # noqa: E501
     'rust': Language(name='rust', ENVIRONMENT_DIR=rust.ENVIRONMENT_DIR, get_default_version=rust.get_default_version, healthy=rust.healthy, install_environment=rust.install_environment, run_hook=rust.run_hook),  # noqa: E501
     'script': Language(name='script', ENVIRONMENT_DIR=script.ENVIRONMENT_DIR, get_default_version=script.get_default_version, healthy=script.healthy, install_environment=script.install_environment, run_hook=script.run_hook),  # noqa: E501

pre_commit/languages/renv.py → pre_commit/languages/r.py

@@ -14,7 +14,7 @@
 from pre_commit.util import clean_path_on_failure
 from pre_commit.util import cmd_output_b
 
-ENVIRONMENT_DIR = 'renv'
+ENVIRONMENT_DIR = 'r'
 get_default_version = helpers.basic_get_default_version
 healthy = helpers.basic_healthy
 

testing/gen-languages-all

@@ -3,7 +3,7 @@ import sys
 
 LANGUAGES = [
     'conda', 'coursier', 'docker', 'dotnet', 'docker_image', 'fail', 'golang',
-    'node', 'perl', 'pygrep', 'python', 'renv', 'ruby', 'rust', 'script',
+    'node', 'perl', 'pygrep', 'python', 'r', 'ruby', 'rust', 'script',
     'swift', 'system',
 ]
 FIELDS = [

testing/resources/renv_hooks_repo/.pre-commit-hooks.yaml → testing/resources/r_hooks_repo/.pre-commit-hooks.yaml

@@ -2,30 +2,30 @@
 -   id: parse-file-no-opts-no-args
     name: Say hi
     entry: Rscript parse-file-no-opts-no-args.R
-    language: renv
+    language: r
     types: [r]
 -   id: parse-file-no-opts-args
     name: Say hi
     entry: Rscript parse-file-no-opts-args.R
     args: [--no-cache]
-    language: renv
+    language: r
     types: [r]
 ## parsing expr
 -   id: parse-expr-no-opts-no-args-1
     name: Say hi
     entry: Rscript -e '1+1'
-    language: renv
+    language: r
     types: [r]
 -   id: parse-expr-args-in-entry-2
     name: Say hi
     entry: Rscript -e '1+1' -e '3' --no-cache3
-    language: renv
+    language: r
     types: [r]# real world
 -   id: hello-world
     name: Say hi
     entry: Rscript hello-world.R
     args: [blibla]
-    language: renv
+    language: r
     types: [r]
 -   id: hello-world-inline
     name: Say hi
@@ -38,10 +38,10 @@
       cat(commandArgs(trailingOnly = TRUE), "from R!\n", sep = ", ")
       '
     args: ['Hi-there']
-    language: renv
+    language: r
     types: [r]
 -   id: additional-deps
     name: Check additional deps
     entry: Rscript additional-deps.R
-    language: renv
+    language: r
     types: [r]

tests/languages/renv_test.py → tests/languages/r_test.py

@@ -2,24 +2,24 @@
 
 import pytest
 
-from pre_commit.languages import renv
+from pre_commit.languages import r
 from testing.fixtures import make_config_from_repo
 from testing.fixtures import make_repo
 from tests.repository_test import _get_hook_no_install
 
 
-def _test_renv_parsing(
+def _test_r_parsing(
     tempdir_factory,
     store,
     hook_id,
     expected_hook_expr={},
     expected_args={},
 ):
-    repo_path = 'renv_hooks_repo'
+    repo_path = 'r_hooks_repo'
     path = make_repo(tempdir_factory, repo_path)
     config = make_config_from_repo(path)
     hook = _get_hook_no_install(config, store, hook_id)
-    ret = renv._cmd_from_hook(hook)
+    ret = r._cmd_from_hook(hook)
     expected_cmd = 'Rscript'
     expected_opts = (
         '--no-save', '--no-restore', '--no-site-file', '--no-environ',
@@ -36,14 +36,14 @@ def _test_renv_parsing(
     assert ret == expected
 
 
-def test_renv_parsing_file_no_opts_no_args(tempdir_factory, store):
+def test_r_parsing_file_no_opts_no_args(tempdir_factory, store):
     hook_id = 'parse-file-no-opts-no-args'
-    _test_renv_parsing(tempdir_factory, store, hook_id)
+    _test_r_parsing(tempdir_factory, store, hook_id)
 
 
-def test_renv_parsing_file_opts_no_args(tempdir_factory, store):
+def test_r_parsing_file_opts_no_args(tempdir_factory, store):
     with pytest.raises(ValueError) as excinfo:
-        renv._entry_validate(['Rscript', '--no-init', '/path/to/file'])
+        r._entry_validate(['Rscript', '--no-init', '/path/to/file'])
 
     msg = excinfo.value.args
     assert msg == (
@@ -52,31 +52,31 @@ def test_renv_parsing_file_opts_no_args(tempdir_factory, store):
     )
 
 
-def test_renv_parsing_file_no_opts_args(tempdir_factory, store):
+def test_r_parsing_file_no_opts_args(tempdir_factory, store):
     hook_id = 'parse-file-no-opts-args'
     expected_args = ['--no-cache']
-    _test_renv_parsing(
+    _test_r_parsing(
         tempdir_factory, store, hook_id, expected_args=expected_args,
     )
 
 
-def test_renv_parsing_expr_no_opts_no_args1(tempdir_factory, store):
+def test_r_parsing_expr_no_opts_no_args1(tempdir_factory, store):
     hook_id = 'parse-expr-no-opts-no-args-1'
-    _test_renv_parsing(
+    _test_r_parsing(
         tempdir_factory, store, hook_id, expected_hook_expr=('-e', '1+1'),
     )
 
 
-def test_renv_parsing_expr_no_opts_no_args2(tempdir_factory, store):
+def test_r_parsing_expr_no_opts_no_args2(tempdir_factory, store):
     with pytest.raises(ValueError) as execinfo:
-        renv._entry_validate(['Rscript', '-e', '1+1', '-e', 'letters'])
+        r._entry_validate(['Rscript', '-e', '1+1', '-e', 'letters'])
     msg = execinfo.value.args
     assert msg == ('You can supply at most one expression.',)
 
 
-def test_renv_parsing_expr_opts_no_args2(tempdir_factory, store):
+def test_r_parsing_expr_opts_no_args2(tempdir_factory, store):
     with pytest.raises(ValueError) as execinfo:
-        renv._entry_validate(
+        r._entry_validate(
             [
                 'Rscript', '--vanilla', '-e', '1+1', '-e', 'letters',
             ],
@@ -88,18 +88,18 @@ def test_renv_parsing_expr_opts_no_args2(tempdir_factory, store):
     )
 
 
-def test_renv_parsing_expr_args_in_entry2(tempdir_factory, store):
+def test_r_parsing_expr_args_in_entry2(tempdir_factory, store):
     with pytest.raises(ValueError) as execinfo:
-        renv._entry_validate(['Rscript', '-e', 'expr1', '--another-arg'])
+        r._entry_validate(['Rscript', '-e', 'expr1', '--another-arg'])
 
     msg = execinfo.value.args
     assert msg == ('You can supply at most one expression.',)
 
 
-def test_renv_parsing_expr_non_Rscirpt(tempdir_factory, store):
+def test_r_parsing_expr_non_Rscirpt(tempdir_factory, store):
 
     with pytest.raises(ValueError) as execinfo:
-        renv._entry_validate(['AnotherScript', '-e', '{{}}'])
+        r._entry_validate(['AnotherScript', '-e', '{{}}'])
 
     msg = execinfo.value.args
     assert msg == ('entry must start with `Rscript`.',)

tests/repository_test.py

@@ -279,25 +279,25 @@ def test_node_hook_with_npm_userconfig_set(tempdir_factory, store, tmpdir):
         test_run_a_node_hook(tempdir_factory, store)
 
 
-def test_renv_hook(tempdir_factory, store):
+def test_r_hook(tempdir_factory, store):
     _test_hook_repo(
-        tempdir_factory, store, 'renv_hooks_repo',
+        tempdir_factory, store, 'r_hooks_repo',
         'hello-world', [os.devnull],
         b'Hello, World, from R!\n',
     )
 
 
-def test_renv_inline_hook(tempdir_factory, store):
+def test_r_inline_hook(tempdir_factory, store):
     _test_hook_repo(
-        tempdir_factory, store, 'renv_hooks_repo',
+        tempdir_factory, store, 'r_hooks_repo',
         'hello-world-inline', ['some-file'],
         b'Hi-there, some-file, from R!\n',
     )
 
 
-def test_renv_with_additional_dependencies_hook(tempdir_factory, store):
+def test_r_with_additional_dependencies_hook(tempdir_factory, store):
     _test_hook_repo(
-        tempdir_factory, store, 'renv_hooks_repo',
+        tempdir_factory, store, 'r_hooks_repo',
         'additional-deps', [os.devnull],
         b'OK\n',
         config_kwargs={
@@ -309,19 +309,19 @@ def test_renv_with_additional_dependencies_hook(tempdir_factory, store):
     )
 
 
-def test_renv_local_with_additional_dependencies_hook(store):
+def test_r_local_with_additional_dependencies_hook(store):
     config = {
         'repo': 'local',
         'hooks': [{
-            'id': 'local-renv',
-            'name': 'local-renv',
+            'id': 'local-r',
+            'name': 'local-r',
             'entry': 'Rscript -e',
-            'language': 'renv',
+            'language': 'r',
             'args': ['if (packageVersion("R6") == "2.1.3") cat("OK\n")'],
             'additional_dependencies': ['R6@2.1.3'],
         }],
     }
-    hook = _get_hook(config, store, 'local-renv')
+    hook = _get_hook(config, store, 'local-r')
     ret, out = _hook_run(hook, (), color=False)
     assert ret == 0
     assert _norm_out(out) == b'OK\n'