From 3d8b979b3f6eb152c4499edc065c6ed14c3d65e0 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:06:03 +0100 Subject: [PATCH] ENH: remove `excludes` from Pyright config (#510) --- pyproject.toml | 10 -------- src/compwa_policy/check_dev_files/__init__.py | 2 +- src/compwa_policy/check_dev_files/pyright.py | 23 +++++++------------ 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3e69b5d7..8fd5e2b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -138,16 +138,6 @@ ignore_missing_imports = true module = ["nbformat.*"] [tool.pyright] -exclude = [ - "**/.git", - "**/.ipynb_checkpoints", - "**/.mypy_cache", - "**/.pytest_cache", - "**/.tox", - "**/.venv/", - "**/__pycache__", - "**/_build", -] reportArgumentType = false reportGeneralTypeIssues = false reportIncompatibleMethodOverride = false diff --git a/src/compwa_policy/check_dev_files/__init__.py b/src/compwa_policy/check_dev_files/__init__.py index 13f96022..5b4f9da6 100644 --- a/src/compwa_policy/check_dev_files/__init__.py +++ b/src/compwa_policy/check_dev_files/__init__.py @@ -130,7 +130,7 @@ def main(argv: Sequence[str] | None = None) -> int: # noqa: PLR0915 ) do(mypy.main) do(pyproject.main, excluded_python_versions, no_pypi=args.no_pypi) - do(pyright.main, package_manager, precommit_config) + do(pyright.main, precommit_config) do(pytest.main) do(pyupgrade.main, precommit_config, args.no_ruff) if not args.no_ruff: diff --git a/src/compwa_policy/check_dev_files/pyright.py b/src/compwa_policy/check_dev_files/pyright.py index 8e8f8c4d..0511c3dd 100644 --- a/src/compwa_policy/check_dev_files/pyright.py +++ b/src/compwa_policy/check_dev_files/pyright.py @@ -16,15 +16,14 @@ from compwa_policy.utilities.toml import to_toml_array if TYPE_CHECKING: - from compwa_policy.check_dev_files.conda import PackageManagerChoice from compwa_policy.utilities.precommit import ModifiablePrecommit -def main(package_manager: PackageManagerChoice, precommit: ModifiablePrecommit) -> None: +def main(precommit: ModifiablePrecommit) -> None: with ModifiablePyproject.load() as pyproject: _merge_config_into_pyproject(pyproject) _update_precommit(precommit, pyproject) - _update_excludes(package_manager, pyproject) + _remove_excludes(pyproject) _update_settings(pyproject) @@ -66,21 +65,15 @@ def _update_precommit(precommit: ModifiablePrecommit, pyproject: Pyproject) -> N precommit.update_single_hook_repo(repo) -def _update_excludes( - package_manager: PackageManagerChoice, pyproject: ModifiablePyproject -) -> None: +def _remove_excludes(pyproject: ModifiablePyproject) -> None: if not __has_pyright(pyproject): return pyright_settings = pyproject.get_table("tool.pyright") - existing_excludes = pyright_settings.get("exclude", []) - expected_excludes = set(existing_excludes) - if "uv" in package_manager: - expected_excludes.add("**/.venv/") - expected_excludes_list = sorted(expected_excludes) - if existing_excludes != expected_excludes_list: - pyright_settings["exclude"] = to_toml_array(expected_excludes_list) - msg = "Updated pyright excludes" - pyproject.changelog.append(msg) + if "exclude" not in pyright_settings: + return + del pyright_settings["exclude"] + msg = "Removed pyright excludes" + pyproject.changelog.append(msg) def _update_settings(pyproject: ModifiablePyproject) -> None: