From 138d69e0360ed7aa70ed8fc2054457b4ee38cc9d Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 30 Jan 2023 10:51:34 -0500 Subject: [PATCH 1/3] Remove redundant reportUnnecessaryTypeIgnoreComment=true since #9397 --- stubs/invoke/@tests/test_cases/check_task.py | 1 - stubs/protobuf/@tests/test_cases/check_struct.py | 1 - stubs/regex/@tests/test_cases/check_finditer.py | 2 -- stubs/requests/@tests/test_cases/check_post.py | 2 -- tests/check_consistent.py | 8 -------- 5 files changed, 14 deletions(-) diff --git a/stubs/invoke/@tests/test_cases/check_task.py b/stubs/invoke/@tests/test_cases/check_task.py index 06b96ad7966f..a56d1488cb07 100644 --- a/stubs/invoke/@tests/test_cases/check_task.py +++ b/stubs/invoke/@tests/test_cases/check_task.py @@ -1,4 +1,3 @@ -# pyright: reportUnnecessaryTypeIgnoreComment=true from __future__ import annotations from invoke import Context, task diff --git a/stubs/protobuf/@tests/test_cases/check_struct.py b/stubs/protobuf/@tests/test_cases/check_struct.py index 87bb72264fb5..d3679af470cd 100644 --- a/stubs/protobuf/@tests/test_cases/check_struct.py +++ b/stubs/protobuf/@tests/test_cases/check_struct.py @@ -1,4 +1,3 @@ -# pyright: reportUnnecessaryTypeIgnoreComment=true from __future__ import annotations from google.protobuf.struct_pb2 import ListValue, Struct diff --git a/stubs/regex/@tests/test_cases/check_finditer.py b/stubs/regex/@tests/test_cases/check_finditer.py index 518a4a5a3d42..0b572973ceaf 100644 --- a/stubs/regex/@tests/test_cases/check_finditer.py +++ b/stubs/regex/@tests/test_cases/check_finditer.py @@ -1,5 +1,3 @@ -# pyright: reportUnnecessaryTypeIgnoreComment=true - from __future__ import annotations from typing import List diff --git a/stubs/requests/@tests/test_cases/check_post.py b/stubs/requests/@tests/test_cases/check_post.py index 59c75395e961..d68a484d9c8e 100644 --- a/stubs/requests/@tests/test_cases/check_post.py +++ b/stubs/requests/@tests/test_cases/check_post.py @@ -1,5 +1,3 @@ -# pyright: reportUnnecessaryTypeIgnoreComment=true - from __future__ import annotations from collections.abc import Iterable diff --git a/tests/check_consistent.py b/tests/check_consistent.py index 73f1b8b7cf7a..acff086a2c40 100644 --- a/tests/check_consistent.py +++ b/tests/check_consistent.py @@ -75,14 +75,6 @@ def check_test_cases() -> None: with open(file, encoding="UTF-8") as f: lines = {line.strip() for line in f} assert "from __future__ import annotations" in lines, "Test-case files should use modern typing syntax where possible" - if package_name != "stdlib": - pyright_setting_not_enabled_msg = ( - f'Third-party test-case file "{file}" must have ' - f'"# pyright: reportUnnecessaryTypeIgnoreComment=true" ' - f"at the top of the file" - ) - has_pyright_setting_enabled = "# pyright: reportUnnecessaryTypeIgnoreComment=true" in lines - assert has_pyright_setting_enabled, pyright_setting_not_enabled_msg def check_no_symlinks() -> None: From 5b92bc33a21c91fc4cd630ae2d618cc23fbb0bc4 Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 30 Jan 2023 10:55:31 -0500 Subject: [PATCH 2/3] Unused variable Flake8 fix --- tests/check_consistent.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/check_consistent.py b/tests/check_consistent.py index acff086a2c40..7c5dc99c63b0 100644 --- a/tests/check_consistent.py +++ b/tests/check_consistent.py @@ -14,8 +14,8 @@ import yaml from packaging.requirements import Requirement from packaging.specifiers import SpecifierSet - from parse_metadata import read_metadata + from utils import VERSIONS_RE, get_all_testcase_directories, get_gitignore_spec, spec_matches_path, strip_comments extension_descriptions = {".pyi": "stub", ".py": ".py"} @@ -67,7 +67,7 @@ def check_stubs() -> None: def check_test_cases() -> None: - for package_name, testcase_dir in get_all_testcase_directories(): + for _package_name, testcase_dir in get_all_testcase_directories(): assert_consistent_filetypes(testcase_dir, kind=".py", allowed={"README.md"}, allow_nonidentifier_filenames=True) bad_test_case_filename = 'Files in a `test_cases` directory must have names starting with "check_"; got "{}"' for file in testcase_dir.rglob("*.py"): From 5baebbf7669ba5e7c740670772f90ccfa1077c20 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:56:58 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks --- tests/check_consistent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/check_consistent.py b/tests/check_consistent.py index 7c5dc99c63b0..d4c370b34235 100644 --- a/tests/check_consistent.py +++ b/tests/check_consistent.py @@ -14,8 +14,8 @@ import yaml from packaging.requirements import Requirement from packaging.specifiers import SpecifierSet -from parse_metadata import read_metadata +from parse_metadata import read_metadata from utils import VERSIONS_RE, get_all_testcase_directories, get_gitignore_spec, spec_matches_path, strip_comments extension_descriptions = {".pyi": "stub", ".py": ".py"}