make sure imports stay sorted

also fix ruff related stuff

Author: BenediktSeidl

.github/workflows/lint.yml

@@ -22,8 +22,11 @@ jobs:
     - name: Install ruff
       run: pip install ruff
 
-    - name: Check code style with ruff
+    - name: Format code with ruff
       run: ruff format --diff
 
+    - name: Check code style with ruff
+      run: ruff check
+
     - name: Check typing with mypy
       run: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.1 /bin/sh build.sh mypy

pygit2/_pygit2.pyi

@@ -50,7 +50,7 @@ from .enums import (
 )
 from .remotes import Remote
 from .repository import BaseRepository
-from .submodules import Submodule, SubmoduleCollection
+from .submodules import SubmoduleCollection
 
 GIT_OBJ_BLOB = Literal[3]
 GIT_OBJ_COMMIT = Literal[1]

pygit2/ffi.py

@@ -25,4 +25,4 @@
 
 # Import from pygit2
 from ._libgit2 import ffi  # type: ignore # noqa: F401
-from ._libgit2 import lib as C
+from ._libgit2 import lib as C  # type: ignore # noqa: F401

pyproject.toml

@@ -28,6 +28,9 @@ repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/li
 extend-exclude = [ ".cache", ".coverage", "build", "site-packages", "venv*"]
 target-version = "py310"  # oldest supported Python version
 
+[tool.ruff.lint]
+select = ["E4", "E7", "E9", "F", "I"]
+
 [tool.ruff.format]
 quote-style = "single"