From e1e5635b399a7ace8c6921c12f6f43a80d0e7b43 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 17 May 2024 15:18:43 -0400 Subject: [PATCH] Review feedback --- src/rapids_pre_commit_hooks/pyproject_license.py | 12 +++++------- .../test_pyproject_license.py | 8 ++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/rapids_pre_commit_hooks/pyproject_license.py b/src/rapids_pre_commit_hooks/pyproject_license.py index 41b75a6..ab119a9 100644 --- a/src/rapids_pre_commit_hooks/pyproject_license.py +++ b/src/rapids_pre_commit_hooks/pyproject_license.py @@ -30,6 +30,8 @@ def find_value_location(document, key, append): copied_document = copy.deepcopy(document) placeholder = uuid.uuid4() + placeholder_toml = tomlkit.string(str(placeholder)) + placeholder_repr = placeholder_toml.as_string() # tomlkit does not provide "mark" information to determine where exactly in the # document a value is located, so instead we replace it with a placeholder and @@ -39,15 +41,13 @@ def find_value_location(document, key, append): node = node[key[0]] key = key[1:] if append: - node.add(str(placeholder), tomlkit.string(str(placeholder))) + node.add(str(placeholder), placeholder_toml) else: old_value = node[key[0]] node[key[0]] = str(placeholder) value_to_find = ( - f"{placeholder} = {tomlkit.string(str(placeholder)).as_string()}" - if append - else tomlkit.string(str(placeholder)).as_string() + f"{placeholder} = {placeholder_repr}" if append else placeholder_repr ) begin_loc = copied_document.as_string().find(value_to_find) end_loc = begin_loc + (0 if append else len(old_value.as_string())) @@ -84,9 +84,7 @@ def check_pyproject_license(linter, args): if license_value not in ACCEPTABLE_LICENSES: loc = find_value_location(document, ("project", "license", "text"), False) - linter.add_warning( - loc, f'license should be "{RAPIDS_LICENSE}"' - ).add_replacement(loc, tomlkit.string(RAPIDS_LICENSE).as_string()) + linter.add_warning(loc, f'license should be "{RAPIDS_LICENSE}"') def main(): diff --git a/test/rapids_pre_commit_hooks/test_pyproject_license.py b/test/rapids_pre_commit_hooks/test_pyproject_license.py index 273405e..9bb4c7c 100644 --- a/test/rapids_pre_commit_hooks/test_pyproject_license.py +++ b/test/rapids_pre_commit_hooks/test_pyproject_license.py @@ -80,8 +80,8 @@ def test_find_value_location(key, append, loc): ), (29, 41), 'license should be "Apache 2.0"', - (29, 41), - '"Apache 2.0"', + None, + None, ), ( dedent( @@ -92,8 +92,8 @@ def test_find_value_location(key, append, loc): ), (29, 34), 'license should be "Apache 2.0"', - (29, 34), - '"Apache 2.0"', + None, + None, ), *( (