From be1bd41497735921fce875ef5427a1715b822177 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Fri, 18 Nov 2022 21:08:37 -0500 Subject: [PATCH 1/3] [primer] Fall back to no rcfile rather than pylint's --- pylint/testutils/_primer/package_to_lint.py | 8 ++++---- tests/testutils/_primer/test_package_to_lint.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pylint/testutils/_primer/package_to_lint.py b/pylint/testutils/_primer/package_to_lint.py index c472a98c5c..f9ec80d0b7 100644 --- a/pylint/testutils/_primer/package_to_lint.py +++ b/pylint/testutils/_primer/package_to_lint.py @@ -58,7 +58,8 @@ def __init__( @property def pylintrc(self) -> Path | None: if self.pylintrc_relpath is None: - return None + # Fall back to "" to ensure pylint's own pylintrc is not discovered + return "" return self.clone_directory / self.pylintrc_relpath @property @@ -75,9 +76,8 @@ def paths_to_lint(self) -> list[str]: @property def pylint_args(self) -> list[str]: options: list[str] = [] - if self.pylintrc is not None: - # There is an error if rcfile is given but does not exist - options += [f"--rcfile={self.pylintrc}"] + # There is an error if rcfile is given but does not exist + options += [f"--rcfile={self.pylintrc}"] return self.paths_to_lint + options + self.pylint_additional_args def lazy_clone(self) -> str: # pragma: no cover diff --git a/tests/testutils/_primer/test_package_to_lint.py b/tests/testutils/_primer/test_package_to_lint.py index 2ee9f3decd..220e2c0b28 100644 --- a/tests/testutils/_primer/test_package_to_lint.py +++ b/tests/testutils/_primer/test_package_to_lint.py @@ -42,8 +42,8 @@ def test_package_to_lint_default_value() -> None: branch="main", directories=["src/flask"], # Must work on Windows (src\\flask) ) - assert package_to_lint.pylintrc is None + assert package_to_lint.pylintrc == "" expected_path_to_lint = ( PRIMER_DIRECTORY_PATH / "pallets" / "flask" / "src" / "flask" ) - assert package_to_lint.pylint_args == [str(expected_path_to_lint)] + assert package_to_lint.pylint_args == [str(expected_path_to_lint), "--rcfile="] From 6467e4be9efd78e42e888609a3ded7bf417ff1ca Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Fri, 18 Nov 2022 21:25:03 -0500 Subject: [PATCH 2/3] fixup! fix typing --- pylint/testutils/_primer/package_to_lint.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pylint/testutils/_primer/package_to_lint.py b/pylint/testutils/_primer/package_to_lint.py index f9ec80d0b7..f93b946a41 100644 --- a/pylint/testutils/_primer/package_to_lint.py +++ b/pylint/testutils/_primer/package_to_lint.py @@ -5,8 +5,14 @@ from __future__ import annotations import logging +import sys from pathlib import Path +if sys.version_info >= (3, 8): + from typing import Literal +else: + from typing_extensions import Literal + from git.cmd import Git from git.repo import Repo @@ -56,7 +62,7 @@ def __init__( self.minimum_python = minimum_python @property - def pylintrc(self) -> Path | None: + def pylintrc(self) -> Path | Literal[""]: if self.pylintrc_relpath is None: # Fall back to "" to ensure pylint's own pylintrc is not discovered return "" From 65babd8904d1ef73c8d3f97e182f294b20741bc6 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Fri, 18 Nov 2022 21:41:16 -0500 Subject: [PATCH 3/3] fixup! sort imports --- pylint/testutils/_primer/package_to_lint.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pylint/testutils/_primer/package_to_lint.py b/pylint/testutils/_primer/package_to_lint.py index f93b946a41..09ecb44560 100644 --- a/pylint/testutils/_primer/package_to_lint.py +++ b/pylint/testutils/_primer/package_to_lint.py @@ -8,14 +8,14 @@ import sys from pathlib import Path +from git.cmd import Git +from git.repo import Repo + if sys.version_info >= (3, 8): from typing import Literal else: from typing_extensions import Literal -from git.cmd import Git -from git.repo import Repo - PRIMER_DIRECTORY_PATH = Path("tests") / ".pylint_primer_tests"