Merge branch 'main' into main

Author: staticdev

.github/workflows/poetry-constraints.txt

@@ -1 +1 @@
-poetry==1.8.5
+poetry==2.0.1

example_isort_formatting_plugin/poetry.lock

@@ -9,11 +9,11 @@ license = "MIT"
 example = "example_isort_formatting_plugin:black_format_import_section"
 
 [tool.poetry.dependencies]
-python = ">=3.7.0"
-isort = ">=5.11.0"
-black = ">=22.8.0"
+python = ">=3.10.0"
+isort = ">=5.12.0"
+black = ">=24.3.0"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

example_isort_formatting_plugin/pyproject.toml

@@ -9,10 +9,10 @@ license = "MIT"
 natural_plus = "example_isort_sorting_plugin:natural_plus"
 
 [tool.poetry.dependencies]
-python = ">=3.7"
+python = ">=3.9"
 natsort = ">=7.1.1"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

example_isort_sorting_plugin/pyproject.toml

@@ -9,9 +9,9 @@ license = "MIT"
 example = "example_shared_isort_profile:PROFILE"
 
 [tool.poetry.dependencies]
-python = ">=3.7"
+python = ">=3.9"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

example_shared_isort_profile/pyproject.toml

@@ -193,7 +193,7 @@ def sort_stream(
     if config.atomic:
         try:
             file_content = input_stream.read()
-            compile(file_content, content_source, "exec", 0, 1)
+            compile(file_content, content_source, "exec", flags=0, dont_inherit=True)
         except SyntaxError:
             if extension not in CYTHON_EXTENSIONS:
                 raise ExistingSyntaxErrors(content_source)
@@ -220,7 +220,7 @@ def sort_stream(
     if config.atomic:
         _internal_output.seek(0)
         try:
-            compile(_internal_output.read(), content_source, "exec", 0, 1)
+            compile(_internal_output.read(), content_source, "exec", flags=0, dont_inherit=True)
             _internal_output.seek(0)
         except SyntaxError:  # pragma: no cover
             if extension not in CYTHON_EXTENSIONS:

isort/api.py

@@ -29,7 +29,7 @@
     from pip_api import parse_requirements  # type: ignore
 
 except ImportError:
-    parse_requirements = None
+    parse_requirements = None  # type: ignore[assignment]
 
 
 @contextmanager

isort/deprecated/finders.py

@@ -86,7 +86,7 @@ def wrap(
 
 @register_type("dict", dict)
 def _dict(value: Dict[Any, Any], printer: ISortPrettyPrinter) -> str:
-    return printer.pformat(dict(sorted(value.items(), key=lambda item: item[1])))  # type: ignore
+    return printer.pformat(dict(sorted(value.items(), key=lambda item: item[1])))
 
 
 @register_type("list", list)

isort/literal.py

@@ -858,7 +858,8 @@ def _get_config_data(file_path: str, sections: Tuple[str, ...]) -> Dict[str, Any
                         and config_key.endswith("}")
                         and extension
                         in map(
-                            lambda text: text.strip(), config_key[len("*.{") : -1].split(",")  # type: ignore # noqa
+                            lambda text: text.strip(),
+                            config_key[len("*.{") : -1].split(","),  # noqa
                         )
                     ):
                         settings.update(config.items(config_key))

isort/settings.py

@@ -117,7 +117,7 @@ def naturally(
     else:
 
         def key_callback(text: str) -> List[Any]:
-            return _natural_keys(key(text))  # type: ignore
+            return _natural_keys(key(text))
 
     return sorted(to_sort, key=key_callback, reverse=reverse)
 

isort/sorting.py

@@ -48,7 +48,7 @@ setuptools = {version = "*", optional = true}
 colors = ["colorama"]
 plugins = ["setuptools"]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 bandit = ">=1.7.7"
 black = ">=24.3.0"
 colorama = ">=0.4.6"
@@ -57,12 +57,12 @@ cruft = ">=2.12.0"
 example-isort-sorting-plugin = ">=0.1.0"
 example-shared-isort-profile = ">=0.1.0"
 flake8 = ">=3.8.4"
-flake8-bugbear = ">=22.12.6,<23.0.0"
+flake8-bugbear = ">=22.12.12"
 httpx = ">=0.13.3"
 hypothesis = ">=6.10.1"
 hypothesmith = ">=0.1.3"
 libcst = ">=0.3.18"
-mypy = ">=0.902,<1.0.0"
+mypy = ">=1.14.1"
 mypy-extensions = ">=0.4.3"
 pep8-naming = ">=0.8.2"
 pip = ">=21.1.1"

poetry.lock

@@ -66,7 +66,7 @@ def configs(**force_strategies: st.SearchStrategy) -> st.SearchStrategy:
         "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)  # type: ignore
+    return st.fixed_dictionaries({}, optional=kwargs).map(_as_config)
 
 
 st.register_type_strategy(isort.Config, configs())

pyproject.toml

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

tests/integration/test_hypothesmith.py

@@ -5551,7 +5551,7 @@ def test_find_imports_in_stream() -> None:
     """Ensure that find_imports_in_stream can work with nonseekable streams like STDOUT"""
 
     class NonSeekableTestStream(StringIO):
-        def seek(self, position):
+        def seek(self, offset: int, whence: int = os.SEEK_SET, /) -> int:
             raise OSError("Stream is not seekable")
 
         def seekable(self):

tests/integration/test_setting_combinations.py

@@ -12,7 +12,7 @@ def test_isort_command_smoke(src_dir):
     command.finalize_options()
     try:
         command.run()
-    except BaseException:
+    except SystemExit:
         pass
 
     command.distribution.package_dir = {"": "isort"}
@@ -27,5 +27,5 @@ def test_isort_command_smoke(src_dir):
     command.finalize_options()
     try:
         command.run()
-    except BaseException:
+    except SystemExit:
         pass