Merge pull request #2311 from matthewhughes934/make-actions-happy

Make actions happy

.github/workflows/constraints.txt

@@ -1,2 +1,2 @@
-pip==22.3.1
+pip==23.2
 virtualenv==20.17.1

.github/workflows/test.yml

@@ -64,7 +64,7 @@ jobs:
 
       - name: Install Poetry
         run: |
-          pipx install --pip-args=--constraint=.github/workflows/poetry-constraints.txt poetry
+          pip install --constraint=.github/workflows/poetry-constraints.txt poetry
           poetry --version
 
       - name: Install dependencies

isort/__init__.py

@@ -1,4 +1,5 @@
 """Defines the public isort interface"""
+
 __all__ = (
     "Config",
     "ImportKey",

isort/api.py

@@ -442,9 +442,9 @@ def sort_file(
                                         file_input=source_file.stream.read(),
                                         file_output=output_stream.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 cast(TextIO, show_diff)
+                                        ),
                                         color_output=config.color_output,
                                     )
                                     if show_diff or (

isort/deprecated/finders.py

@@ -1,4 +1,5 @@
 """Finders try to find right section for passed module name"""
+
 import importlib.machinery
 import inspect
 import os
@@ -232,7 +233,6 @@ def _load_mapping() -> Optional[Dict[str, str]]:
                 import_name, _, pypi_name = line.strip().partition(":")
                 mappings[pypi_name] = import_name
             return mappings
-            # return dict(tuple(line.strip().split(":")[::-1]) for line in f)
 
     def _load_names(self) -> List[str]:
         """Return list of thirdparty modules from requirements"""

isort/exceptions.py

@@ -1,4 +1,5 @@
 """All isort specific exception classes should be defined here"""
+
 from functools import partial
 from pathlib import Path
 from typing import Any, Dict, List, Type, Union

isort/hooks.py

@@ -3,6 +3,7 @@
 usage:
     exit_code = git_hook(strict=True|False, modify=True|False)
 """
+
 import os
 import subprocess  # nosec - Needed for hook
 from pathlib import Path

isort/identify.py

@@ -1,6 +1,7 @@
 """Fast stream based import identification.
 Eventually this will likely replace parse.py
 """
+
 from functools import partial
 from pathlib import Path
 from typing import Iterator, NamedTuple, Optional, TextIO, Tuple

isort/io.py

@@ -1,4 +1,5 @@
 """Defines any IO utilities used by isort"""
+
 import dataclasses
 import re
 import tokenize

isort/main.py

@@ -1,4 +1,5 @@
 """Tool for sorting imports alphabetically, and automatically separated into sections."""
+
 import argparse
 import functools
 import json

isort/parse.py

@@ -1,4 +1,5 @@
 """Defines parsing functions used by isort for parsing import definitions"""
+
 import re
 from collections import OrderedDict, defaultdict
 from functools import partial
@@ -475,9 +476,9 @@ def file_contents(contents: str, config: Config = DEFAULT_CONFIG) -> ParsedConte
                         import_from, {}
                     )
                     existing_comment = nested_from_comments.get(just_imports[0], "")
-                    nested_from_comments[
-                        just_imports[0]
-                    ] = f"{existing_comment}{'; ' if existing_comment else ''}{'; '.join(comments)}"
+                    nested_from_comments[just_imports[0]] = (
+                        f"{existing_comment}{'; ' if existing_comment else ''}{'; '.join(comments)}"
+                    )
                     comments = []
 
                 if comments and attach_comments_to is None:

isort/place.py

@@ -1,4 +1,5 @@
 """Contains all logic related to placing an import within a certain section."""
+
 import importlib
 from fnmatch import fnmatch
 from functools import lru_cache

isort/profiles.py

@@ -1,4 +1,5 @@
 """Common profiles are defined here to be easily used within a project using --profile {name}"""
+
 from typing import Any, Dict
 
 black = {

isort/sections.py

@@ -1,4 +1,5 @@
 """Defines all sections isort uses by default"""
+
 from typing import Tuple
 
 FUTURE: str = "FUTURE"

isort/settings.py

@@ -2,6 +2,7 @@
 
 Defines how the default settings for isort should be loaded
 """
+
 import configparser
 import fnmatch
 import os
@@ -553,8 +554,7 @@ def is_supported_filetype(self, file_name: str) -> bool:
                 line = fp.readline(100)
         except OSError:
             return False
-        else:
-            return bool(_SHEBANG_RE.match(line))
+        return bool(_SHEBANG_RE.match(line))
 
     def _check_folder_git_ls_files(self, folder: str) -> Optional[Path]:
         env = {**os.environ, "LANG": "C.UTF-8"}
@@ -761,9 +761,11 @@ def _as_list(value: str) -> List[str]:
 
 def _abspaths(cwd: str, values: Iterable[str]) -> Set[str]:
     paths = {
-        os.path.join(cwd, value)
-        if not value.startswith(os.path.sep) and value.endswith(os.path.sep)
-        else value
+        (
+            os.path.join(cwd, value)
+            if not value.startswith(os.path.sep) and value.endswith(os.path.sep)
+            else value
+        )
         for value in values
     }
     return paths

isort/wrap.py

@@ -92,9 +92,9 @@ def line(content: str, line_separator: str, config: Config = DEFAULT_CONFIG) ->
                         )
                         else ""
                     )
-                    line_parts[
-                        -1
-                    ] = f"{line_parts[-1].strip()}{_comma_maybe}{config.comment_prefix}{comment}"
+                    line_parts[-1] = (
+                        f"{line_parts[-1].strip()}{_comma_maybe}{config.comment_prefix}{comment}"
+                    )
                 next_line = []
                 while (len(content) + 2) > (
                     config.wrap_length or config.line_length

isort/wrap_modes.py

@@ -1,4 +1,5 @@
 """Defines all wrap modes that can be used when outputting formatted imports"""
+
 import enum
 from inspect import signature
 from typing import Any, Callable, Dict, List