make sure imports stay sorted

BenediktSeidl · BenediktSeidl · commit 41a76dd0bad7 · 2025-07-26T17:57:12.000+02:00
also fix ruff related stuff
diff --git a/.github/workflows/lint.yml b/.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
diff --git a/pygit2/_pygit2.pyi b/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]
diff --git a/pygit2/ffi.py b/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
diff --git a/pyproject.toml b/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"
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ from .enums import (`
`50`	`50`	`)`
`51`	`51`	`from .remotes import Remote`
`52`	`52`	`from .repository import BaseRepository`
`53`		`-from .submodules import Submodule, SubmoduleCollection`
	`53`	`+from .submodules import SubmoduleCollection`
`54`	`54`
`55`	`55`	`GIT_OBJ_BLOB = Literal[3]`
`56`	`56`	`GIT_OBJ_COMMIT = Literal[1]`