Skip to content

Commit 6007f97

Browse files
committed
ruff check --fix
1 parent 230fad9 commit 6007f97

File tree

6 files changed

+28
-30
lines changed

6 files changed

+28
-30
lines changed

pygit2/__init__.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,24 @@
295295
)
296296
from .blame import Blame, BlameHunk
297297
from .blob import BlobIO
298+
from .callbacks import (
299+
CheckoutCallbacks,
300+
Payload,
301+
RemoteCallbacks,
302+
StashApplyCallbacks,
303+
get_credentials,
304+
git_clone_options,
305+
git_fetch_options,
306+
git_proxy_options,
307+
)
308+
from .config import Config
309+
from .credentials import *
310+
from .errors import Passthrough, check_error
311+
from .ffi import C, ffi
312+
from .filter import Filter
313+
from .index import Index, IndexEntry
314+
from .legacyenums import *
298315
from .options import (
299-
option,
300316
GIT_OPT_ADD_SSL_X509_CERT,
301317
GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS,
302318
GIT_OPT_ENABLE_CACHING,
@@ -343,24 +359,8 @@
343359
GIT_OPT_SET_USER_AGENT,
344360
GIT_OPT_SET_USER_AGENT_PRODUCT,
345361
GIT_OPT_SET_WINDOWS_SHAREMODE,
362+
option,
346363
)
347-
from .callbacks import (
348-
CheckoutCallbacks,
349-
Payload,
350-
RemoteCallbacks,
351-
StashApplyCallbacks,
352-
get_credentials,
353-
git_clone_options,
354-
git_fetch_options,
355-
git_proxy_options,
356-
)
357-
from .config import Config
358-
from .credentials import *
359-
from .errors import Passthrough, check_error
360-
from .ffi import C, ffi
361-
from .filter import Filter
362-
from .index import Index, IndexEntry
363-
from .legacyenums import *
364364
from .packbuilder import PackBuilder
365365
from .remotes import Remote
366366
from .repository import Repository

pygit2/_pygit2.pyi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ from .enums import (
2525
ApplyLocation,
2626
BlobFilter,
2727
BranchType,
28-
ConfigLevel,
2928
DeltaStatus,
3029
DiffFind,
3130
DiffFlag,
@@ -35,7 +34,6 @@ from .enums import (
3534
MergeAnalysis,
3635
MergePreference,
3736
ObjectType,
38-
Option,
3937
ReferenceFilter,
4038
ReferenceType,
4139
ResetMode,

pygit2/enums.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525

2626
from enum import IntEnum, IntFlag
2727

28-
from . import _pygit2
29-
from . import options
28+
from . import _pygit2, options
3029
from .ffi import C
3130

3231

pygit2/options.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__ import annotations
21
# Copyright 2010-2025 The pygit2 contributors
32
#
43
# This file is free software; you can redistribute it and/or modify
@@ -28,18 +27,18 @@
2827
Libgit2 global options management using CFFI.
2928
"""
3029

31-
from typing import Any, Literal, overload, cast
30+
from __future__ import annotations
31+
32+
# Import only for type checking to avoid circular imports
33+
from typing import TYPE_CHECKING, Any, Literal, cast, overload
3234

33-
from .ffi import C, ffi
3435
from .errors import check_error
36+
from .ffi import C, ffi
3537
from .utils import to_bytes, to_str
3638

37-
# Import only for type checking to avoid circular imports
38-
from typing import TYPE_CHECKING
39-
4039
if TYPE_CHECKING:
40+
from ._libgit2.ffi import NULL_TYPE, ArrayC, char, char_pointer
4141
from .enums import ConfigLevel, ObjectType, Option
42-
from ._libgit2.ffi import ArrayC, NULL_TYPE, char, char_pointer
4342

4443
# Export GIT_OPT constants for backward compatibility
4544
GIT_OPT_GET_MWINDOW_SIZE: int = C.GIT_OPT_GET_MWINDOW_SIZE

pygit2/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232

3333
import pygit2.enums
3434

35-
from .options import option
3635
from .enums import ConfigLevel, Option
3736
from .errors import GitError
37+
from .options import option
3838

3939

4040
class SearchPathList:

test/test_settings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
"""Test the Settings class."""
2727

2828
import sys
29+
2930
import pytest
31+
3032
import pygit2
3133
from pygit2.enums import ConfigLevel, ObjectType
3234

0 commit comments

Comments
 (0)