Fix linting errors from latest depednency upgrades

Author: timothycrosley

isort/api.py

@@ -178,7 +178,7 @@ def sort_stream(
             file_input=_input_stream.read(),
             file_output=_output_stream.read(),
             file_path=file_path,
-            output=output_stream if show_diff is True else cast(TextIO, show_diff),
+            output=output_stream if show_diff is True else show_diff,
             color_output=config.color_output,
         )
         return changed
@@ -296,7 +296,7 @@ def check_stream(
             file_input=file_contents,
             file_output=output_stream.read(),
             file_path=file_path,
-            output=None if show_diff is True else cast(TextIO, show_diff),
+            output=None if show_diff is True else show_diff,
             color_output=config.color_output,
         )
     return False
@@ -488,7 +488,7 @@ def sort_file(
                             file_input=source_file.stream.read(),
                             file_output=output.read(),
                             file_path=actual_file_path,
-                            output=None if show_diff is True else cast(TextIO, show_diff),
+                            output=None if show_diff is True else show_diff,
                             color_output=config.color_output,
                         )
                     source_file.stream.close()

isort/settings.py

@@ -38,7 +38,7 @@
     SortingFunctionDoesNotExist,
     UnsupportedSettings,
 )
-from .profiles import profiles
+from .profiles import profiles as profiles
 from .sections import DEFAULT as SECTION_DEFAULTS
 from .sections import FIRSTPARTY, FUTURE, LOCALFOLDER, STDLIB, THIRDPARTY
 from .utils import Trie
@@ -318,7 +318,7 @@ def __init__(
             config_vars.pop("_skips")
             config_vars.pop("_skip_globs")
             config_vars.pop("_sorting_function")
-            super().__init__(**config_vars)  # type: ignore
+            super().__init__(**config_vars)
             return
 
         # We can't use self.quiet to conditionally show warnings before super.__init__() is called

tests/benchmark/test_api.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 import pytest
 
 from isort import api
@@ -7,7 +9,7 @@
 
 
 @pytest.fixture
-def imperfect(tmpdir) -> None:
+def imperfect(tmpdir) -> Any:
     imperfect_file = tmpdir.join("test_needs_changes.py")
     imperfect_file.write_text(imperfect_content, "utf8")
     return imperfect_file

tests/integration/test_hypothesmith.py

@@ -33,7 +33,7 @@ def _record_targets(code: str, prefix: str = "") -> str:
     return code
 
 
-def configs(**force_strategies: st.SearchStrategy) -> st.SearchStrategy[isort.Config]:
+def configs(**force_strategies: st.SearchStrategy[isort.Config]) -> st.SearchStrategy[isort.Config]:
     """Generate arbitrary Config objects."""
     skip = {
         "line_ending",
@@ -66,7 +66,7 @@ def configs(**force_strategies: st.SearchStrategy) -> st.SearchStrategy[isort.Co
         "py_version": st.sampled_from(("auto",) + isort.settings.VALID_PY_TARGETS),
     }
     kwargs = {**inferred_kwargs, **specific, **force_strategies}
-    return st.fixed_dictionaries({}, optional=kwargs).map(_as_config)
+    return st.fixed_dictionaries({}, optional=kwargs).map(_as_config)  # type: ignore
 
 
 st.register_type_strategy(isort.Config, configs())

tests/integration/test_projects_using_isort.py

@@ -6,9 +6,11 @@
 It is important to isort that as few regressions as possible are experienced by our users.
 Having your project tested here is the most sure way to keep those regressions form ever happening.
 """
+from __future__ import annotations
+
 from pathlib import Path
 from subprocess import check_call
-from typing import Sequence
+from typing import Generator, Sequence
 
 from isort.main import main
 
@@ -18,7 +20,7 @@ def git_clone(repository_url: str, directory: Path):
     check_call(["git", "clone", "--depth", "1", repository_url, str(directory)])
 
 
-def run_isort(arguments: Sequence[str]):
+def run_isort(arguments: Generator[str, None, None] | Sequence[str]):
     """Runs isort in diff and check mode with the given arguments"""
     main(["--check-only", "--diff", *arguments])
 

tests/integration/test_setting_combinations.py

@@ -61,7 +61,7 @@ def configs() -> st.SearchStrategy[isort.Config]:
         "py_version": st.sampled_from(("auto",) + isort.settings.VALID_PY_TARGETS),
     }
     kwargs = {**inferred_kwargs, **specific}
-    return st.fixed_dictionaries({}, optional=kwargs).map(_as_config)
+    return st.fixed_dictionaries({}, optional=kwargs).map(_as_config)  # type:ignore
 
 
 st.register_type_strategy(isort.Config, configs())

tests/unit/test_format.py

@@ -105,7 +105,7 @@ def test_colored_printer_diff_output(capsys):
 def test_colorama_not_available_handled_gracefully(capsys):
     with pytest.raises(SystemExit) as system_exit:
         _ = isort.format.create_terminal_printer(color=True)
-    assert system_exit.value.code > 0
+    assert system_exit.value.code and int(system_exit.value.code) > 0
     _, err = capsys.readouterr()
     assert "colorama" in err
     assert "colors extra" in err

tests/unit/test_ticketed_features.py

@@ -617,7 +617,7 @@ def test_isort_should_warn_on_empty_custom_config_issue_1433(tmpdir):
 quiet = true
 """
     )
-    with pytest.warns(None) as warning:
+    with pytest.warns(None) as warning:  # type: ignore
         assert Config(settings_file=str(settings_file)).quiet
     assert not warning