remove --diff option

tests/unit/test_checker_manager.py

@@ -14,12 +14,7 @@ from flake8.plugins import finder
 
 def style_guide_mock():
     """Create a mock StyleGuide object."""
-    return mock.MagicMock(
-        **{
-            "options.diff": False,
-            "options.jobs": JobsArgument("4"),
-        }
-    )
+    return mock.MagicMock(**{"options.jobs": JobsArgument("4")})
 
 
 def _parallel_checker_manager():

tests/unit/test_discover_files.py

@@ -125,7 +125,6 @@ def _expand_paths(
     stdin_display_name="stdin",
     filename_patterns=("*.py",),
     exclude=(),
-    is_running_from_diff=False,
 ):
     return set(
         expand_paths(
@@ -133,7 +132,6 @@ def _expand_paths(
             stdin_display_name=stdin_display_name,
             filename_patterns=filename_patterns,
             exclude=exclude,
-            is_running_from_diff=is_running_from_diff,
         )
     )
 
@@ -166,11 +164,3 @@ def test_alternate_stdin_name_is_filtered():
 def test_filename_included_even_if_not_matching_include(tmp_path):
     some_file = str(tmp_path.joinpath("some/file"))
     assert _expand_paths(paths=(some_file,)) == {some_file}
-
-
-def test_diff_filenames_filtered_by_patterns(tmp_path):
-    f1 = str(tmp_path.joinpath("f1"))
-    f2 = str(tmp_path.joinpath("f2.py"))
-
-    ret = _expand_paths(paths=(f1, f2), is_running_from_diff=True)
-    assert ret == {f2}

tests/unit/test_utils.py

@@ -183,44 +183,6 @@ def test_fnmatch(filename, patterns, expected):
     assert utils.fnmatch(filename, patterns) is expected
 
 
-def read_diff_file(filename):
-    """Read the diff file in its entirety."""
-    with open(filename) as fd:
-        content = fd.read()
-    return content
-
-
-SINGLE_FILE_DIFF = read_diff_file("tests/fixtures/diffs/single_file_diff")
-SINGLE_FILE_INFO = {
-    "flake8/utils.py": set(range(75, 83)).union(set(range(84, 94))),
-}
-TWO_FILE_DIFF = read_diff_file("tests/fixtures/diffs/two_file_diff")
-TWO_FILE_INFO = {
-    "flake8/utils.py": set(range(75, 83)).union(set(range(84, 94))),
-    "tests/unit/test_utils.py": set(range(115, 128)),
-}
-MULTI_FILE_DIFF = read_diff_file("tests/fixtures/diffs/multi_file_diff")
-MULTI_FILE_INFO = {
-    "flake8/utils.py": set(range(75, 83)).union(set(range(84, 94))),
-    "tests/unit/test_utils.py": set(range(115, 129)),
-    "tests/fixtures/diffs/single_file_diff": set(range(1, 28)),
-    "tests/fixtures/diffs/two_file_diff": set(range(1, 46)),
-}
-
-
-@pytest.mark.parametrize(
-    "diff, parsed_diff",
-    [
-        (SINGLE_FILE_DIFF, SINGLE_FILE_INFO),
-        (TWO_FILE_DIFF, TWO_FILE_INFO),
-        (MULTI_FILE_DIFF, MULTI_FILE_INFO),
-    ],
-)
-def test_parse_unified_diff(diff, parsed_diff):
-    """Verify that what we parse from a diff matches expectations."""
-    assert utils.parse_unified_diff(diff) == parsed_diff
-
-
 def test_stdin_get_value_crlf():
     """Ensure that stdin is normalized from crlf to lf."""
     stdin = io.TextIOWrapper(io.BytesIO(b"1\r\n2\r\n"), "UTF-8")

tests/unit/test_violation.py

@@ -51,22 +51,3 @@ def test_disable_is_inline_ignored():
         assert error.is_inline_ignored(True) is False
 
     assert getline.called is False
-
-
-@pytest.mark.parametrize(
-    "violation_file,violation_line,diff,expected",
-    [
-        ("file.py", 10, {}, True),
-        ("file.py", 1, {"file.py": range(1, 2)}, True),
-        ("file.py", 10, {"file.py": range(1, 2)}, False),
-        ("file.py", 1, {"other.py": range(1, 2)}, False),
-        ("file.py", 10, {"other.py": range(1, 2)}, False),
-    ],
-)
-def test_violation_is_in_diff(violation_file, violation_line, diff, expected):
-    """Verify that we find violations within a diff."""
-    violation = Violation(
-        "E001", violation_file, violation_line, 1, "warning", "line"
-    )
-
-    assert violation.is_in(diff) is expected