sort imports with "ruff check --select I --fix"

Author: BenediktSeidl

pygit2/__init__.py

@@ -30,26 +30,29 @@
 import os
 import typing
 
-# Low level API
-from ._pygit2 import *
-from ._pygit2 import _cache_enums
-
 # High level API
 from . import enums
 from ._build import __version__
+
+# Low level API
+from ._pygit2 import *
+from ._pygit2 import _cache_enums
 from .blame import Blame, BlameHunk
 from .blob import BlobIO
-from .callbacks import Payload, RemoteCallbacks, CheckoutCallbacks, StashApplyCallbacks
 from .callbacks import (
+    CheckoutCallbacks,
+    Payload,
+    RemoteCallbacks,
+    StashApplyCallbacks,
+    get_credentials,
     git_clone_options,
     git_fetch_options,
     git_proxy_options,
-    get_credentials,
 )
 from .config import Config
 from .credentials import *
-from .errors import check_error, Passthrough
-from .ffi import ffi, C
+from .errors import Passthrough, check_error
+from .ffi import C, ffi
 from .filter import Filter
 from .index import Index, IndexEntry
 from .legacyenums import *
@@ -60,7 +63,6 @@
 from .submodules import Submodule
 from .utils import to_bytes, to_str
 
-
 # Features
 features = enums.Feature(C.git_libgit2_features())
 

pygit2/_libgit2/ffi.pyi

@@ -23,8 +23,8 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-from typing import Literal, overload, NewType, TypeVar, Generic, Any, SupportsIndex
-from typing import NewType, Literal, TypeVar, Generic, overload
+from typing import Any, Generic, Literal, NewType, SupportsIndex, TypeVar, overload
+
 from pygit2._pygit2 import Repository
 
 T = TypeVar('T')

pygit2/_pygit2.pyi

@@ -1,25 +1,37 @@
+import tarfile
+from collections.abc import Generator
+from io import DEFAULT_BUFFER_SIZE, IOBase
+from pathlib import Path
+from queue import Queue
+from threading import Event
 from typing import (
+    Generic,
     Iterator,
     Literal,
     Optional,
-    overload,
     Type,
     TypedDict,
     TypeVar,
-    Generic,
+    overload,
 )
-from io import IOBase, DEFAULT_BUFFER_SIZE
-from pathlib import Path
-from queue import Queue
-import tarfile
-from threading import Event
+
 from . import Index
+from ._libgit2.ffi import (
+    GitCommitC,
+    GitObjectC,
+    GitProxyOptionsC,
+    GitRepositoryC,
+    GitSignatureC,
+    _Pointer,
+)
+from .blame import Blame
+from .callbacks import CheckoutCallbacks
 from .enums import (
-    AttrCheck,
     ApplyLocation,
-    BranchType,
-    BlobFilter,
+    AttrCheck,
     BlameFlag,
+    BlobFilter,
+    BranchType,
     CheckoutStrategy,
     DeltaStatus,
     DiffFind,
@@ -36,22 +48,9 @@ from .enums import (
     ResetMode,
     SortMode,
 )
-from collections.abc import Generator
-
-from ._libgit2.ffi import (
-    _Pointer,
-    GitObjectC,
-    GitCommitC,
-    GitRepositoryC,
-    GitProxyOptionsC,
-    GitSignatureC,
-)
-
-from .repository import BaseRepository
-from .submodules import SubmoduleCollection, Submodule
 from .remotes import Remote
-from .callbacks import CheckoutCallbacks
-from .blame import Blame
+from .repository import BaseRepository
+from .submodules import Submodule, SubmoduleCollection
 
 GIT_OBJ_BLOB = Literal[3]
 GIT_OBJ_COMMIT = Literal[1]

pygit2/_run.py

@@ -29,8 +29,8 @@
 
 # Import from the Standard Library
 import codecs
-from pathlib import Path
 import sys
+from pathlib import Path
 
 # Import from cffi
 from cffi import FFI  # type: ignore

pygit2/blame.py

@@ -23,15 +23,16 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-from typing import Iterator, TYPE_CHECKING
+from typing import TYPE_CHECKING, Iterator
+
+from ._pygit2 import Oid, Repository, Signature
 
 # Import from pygit2
-from .ffi import ffi, C
+from .ffi import C, ffi
 from .utils import GenericIterator
-from ._pygit2 import Signature, Oid, Repository
 
 if TYPE_CHECKING:
-    from ._libgit2.ffi import GitSignatureC, GitHunkC, GitBlameC
+    from ._libgit2.ffi import GitBlameC, GitHunkC, GitSignatureC
 
 
 def wrap_signature(csig: 'GitSignatureC') -> None | Signature:

pygit2/blob.py

@@ -2,8 +2,8 @@
 import threading
 import time
 from contextlib import AbstractContextManager
-from typing import Optional
 from queue import Queue
+from typing import Optional
 
 from ._pygit2 import Blob, Oid
 from .enums import BlobFilter

pygit2/branches.py

@@ -24,10 +24,11 @@
 # Boston, MA 02110-1301, USA.
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
-from .enums import BranchType, ReferenceType
 from ._pygit2 import Commit, Oid
+from .enums import BranchType, ReferenceType
 
 # Need BaseRepository for type hints, but don't let it cause a circular dependency
 if TYPE_CHECKING:

pygit2/callbacks.py

@@ -65,22 +65,23 @@
 # Standard Library
 from contextlib import contextmanager
 from functools import wraps
-from typing import Optional, Union, TYPE_CHECKING, Callable, Generator
+from typing import TYPE_CHECKING, Callable, Generator, Optional, Union
 
 # pygit2
-from ._pygit2 import Oid, DiffFile
+from ._pygit2 import DiffFile, Oid
+from .credentials import Keypair, Username, UserPass
 from .enums import CheckoutNotify, CheckoutStrategy, CredentialType, StashApplyProgress
-from .errors import check_error, Passthrough
-from .ffi import ffi, C
-from .utils import maybe_string, to_bytes, ptr_to_bytes, StrArray
-from .credentials import Username, UserPass, Keypair
+from .errors import Passthrough, check_error
+from .ffi import C, ffi
+from .utils import StrArray, maybe_string, ptr_to_bytes, to_bytes
 
 _Credentials = Username | UserPass | Keypair
 
 if TYPE_CHECKING:
-    from .remotes import TransferProgress
-    from ._pygit2 import PushOptions, CloneOptions
     from pygit2._libgit2.ffi import GitProxyOptionsC
+
+    from ._pygit2 import CloneOptions, PushOptions
+    from .remotes import TransferProgress
 #
 # The payload is the way to pass information from the pygit2 API, through
 # libgit2, to the Python callbacks. And back.

pygit2/config.py

@@ -30,7 +30,7 @@
 
 # Import from pygit2
 from .errors import check_error
-from .ffi import ffi, C
+from .ffi import C, ffi
 from .utils import to_bytes
 
 

pygit2/credentials.py

@@ -29,7 +29,6 @@
 
 from .enums import CredentialType
 
-
 if TYPE_CHECKING:
     from pathlib import Path