Skip to content

Commit d78b26f

Browse files
committed
Apply feedback
1 parent 81ff10c commit d78b26f

File tree

7 files changed

+24
-12
lines changed

7 files changed

+24
-12
lines changed
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
version = "3.3.*"
22
upstream_repository = "https://github.com/django-import-export/django-import-export"
3-
requires = ["django-stubs", "tablib"]
3+
requires = ["django-stubs"] # Add tablib when typed, and update _Incomplete aliases in stubs
4+
5+
[tool.stubtest]
6+
skip = true # Django requires configured settings at runtime

stubs/django-import-export/import_export/admin.pyi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
from _typeshed import Incomplete
12
from collections.abc import Callable
23
from logging import Logger
34
from typing import Any, TypeVar
4-
from typing_extensions import deprecated
5+
from typing_extensions import TypeAlias, deprecated
56

67
from django.contrib import admin
78
from django.contrib.admin.helpers import ActionForm
@@ -12,13 +13,13 @@ from django.http.request import HttpRequest
1213
from django.http.response import HttpResponse
1314
from django.template.response import TemplateResponse
1415
from django.urls import URLPattern
15-
from tablib import Dataset # type: ignore[import-untyped]
1616

1717
from .formats.base_formats import Format
1818
from .mixins import BaseExportMixin, BaseImportMixin
1919
from .results import Result
2020
from .tmp_storages import BaseStorage
2121

22+
Dataset: TypeAlias = Incomplete # tablib.Dataset
2223
logger: Logger
2324

2425
_ModelT = TypeVar("_ModelT", bound=Model)

stubs/django-import-export/import_export/formats/base_formats.pyi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from _typeshed import ReadableBuffer
1+
from _typeshed import Incomplete, ReadableBuffer
22
from typing import IO, Any, ClassVar
3-
from typing_extensions import Self
3+
from typing_extensions import Self, TypeAlias
44

5-
from tablib import Dataset # type: ignore[import-untyped]
5+
Dataset: TypeAlias = Incomplete # tablib.Dataset
66

77
class Format:
88
def get_title(self) -> type[Self]: ...

stubs/django-import-export/import_export/instance_loaders.pyi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
from _typeshed import Incomplete
12
from typing import Any
3+
from typing_extensions import TypeAlias
24

35
from django.db.models import Model, QuerySet
4-
from tablib import Dataset # type: ignore[import-untyped]
56

67
from .fields import Field
78
from .resources import Resource
89

10+
Dataset: TypeAlias = Incomplete # tablib.Dataset
11+
912
class BaseInstanceLoader:
1013
resource: Resource[Any]
1114
dataset: Dataset | None

stubs/django-import-export/import_export/mixins.pyi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
from _typeshed import SupportsGetItem
1+
from _typeshed import Incomplete, SupportsGetItem
22
from logging import Logger
33
from typing import Any, Generic, TypeVar
4+
from typing_extensions import TypeAlias
45

56
from django.db.models import Model, QuerySet
67
from django.forms import BaseForm, Form
78
from django.http.request import HttpRequest
89
from django.http.response import HttpResponse
910
from django.views.generic.edit import FormView
10-
from tablib import Dataset # type: ignore[import-untyped]
1111

1212
from .formats.base_formats import Format
1313
from .resources import Resource
1414

15+
Dataset: TypeAlias = Incomplete # tablib.Dataset
16+
1517
logger: Logger
1618

1719
_ModelT = TypeVar("_ModelT", bound=Model)

stubs/django-import-export/import_export/resources.pyi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
from _typeshed import Incomplete
12
from collections import OrderedDict
23
from collections.abc import Iterator, Sequence
34
from functools import partial
45
from logging import Logger
56
from typing import Any, ClassVar, Generic, Literal, NoReturn, TypeVar, overload
6-
from typing_extensions import deprecated
7+
from typing_extensions import TypeAlias, deprecated
78

89
from django.db.models import Field as DjangoField, ForeignObjectRel, Model, QuerySet
910
from django.utils.safestring import SafeString
10-
from tablib import Dataset # type: ignore[import-untyped]
1111

1212
from .fields import Field
1313
from .instance_loaders import BaseInstanceLoader
1414
from .results import Error, Result, RowResult
1515
from .widgets import ForeignKeyWidget, ManyToManyWidget, Widget
1616

17+
Dataset: TypeAlias = Incomplete # tablib.Dataset
1718
logger: Logger
1819

1920
@overload

stubs/django-import-export/import_export/results.pyi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
from _typeshed import Incomplete
12
from collections import OrderedDict
23
from collections.abc import Iterator
34
from typing import Any, ClassVar, Literal
45
from typing_extensions import TypeAlias
56

67
from django.core.exceptions import ValidationError
78
from django.db.models import Model
8-
from tablib import Dataset # type: ignore[import-untyped]
9+
10+
Dataset: TypeAlias = Incomplete # tablib.Dataset
911

1012
class Error:
1113
error: Exception

0 commit comments

Comments
 (0)