Skip to content

Commit 78b009a

Browse files
committed
Merge branch 'main' into feature/cmp0xff/arithmetic-mul
2 parents 8b987d4 + 76fed11 commit 78b009a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+481
-419
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,10 @@ repos:
1111
hooks:
1212
- id: isort
1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.13.2
14+
rev: v0.13.3
1515
hooks:
1616
- id: ruff-check
17-
args: [
18-
--exit-non-zero-on-fix,
19-
--target-version, py39,
20-
--extend-select, "PYI,UP,RUF100",
21-
--ignore, "E501,E731,F841,PYI042",
22-
--per-file-ignores, "_*.pyi:PYI001",
23-
--fix
24-
]
17+
args: [--exit-non-zero-on-fix]
2518
- repo: https://github.com/codespell-project/codespell
2619
rev: v2.4.1
2720
hooks:

pandas-stubs/_libs/lib.pyi

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ from enum import Enum
22
from typing import (
33
Final,
44
Literal,
5-
)
6-
7-
import numpy as np
8-
from typing_extensions import (
95
TypeAlias,
106
TypeGuard,
117
)
128

9+
import numpy as np
10+
1311
class _NoDefault(Enum):
1412
no_default = ...
1513

pandas-stubs/_libs/missing.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
from collections.abc import Callable
12
from typing import (
23
Any,
3-
Callable,
44
Literal,
55
overload,
66
)

pandas-stubs/_libs/tslibs/nattype.pyi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ from datetime import (
44
timedelta,
55
tzinfo as _tzinfo,
66
)
7-
from typing import Literal
8-
9-
import numpy as np
10-
from typing_extensions import (
11-
Self,
7+
from typing import (
8+
Literal,
129
TypeAlias,
1310
)
1411

12+
import numpy as np
13+
from typing_extensions import Self
14+
1515
from pandas._libs.tslibs.period import Period
1616
from pandas._typing import (
1717
Frequency,

pandas-stubs/_libs/tslibs/period.pyi

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import datetime
22
from typing import (
33
Literal,
4+
TypeAlias,
45
overload,
56
)
67

@@ -12,10 +13,7 @@ from pandas import (
1213
Timedelta,
1314
TimedeltaIndex,
1415
)
15-
from typing_extensions import (
16-
Self,
17-
TypeAlias,
18-
)
16+
from typing_extensions import Self
1917

2018
from pandas._libs.tslibs import NaTType
2119
from pandas._libs.tslibs.offsets import BaseOffset

pandas-stubs/_libs/tslibs/timedeltas.pyi

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ from typing import (
88
ClassVar,
99
Literal,
1010
NamedTuple,
11+
TypeAlias,
1112
overload,
1213
)
1314

@@ -20,10 +21,7 @@ from pandas import (
2021
Series,
2122
TimedeltaIndex,
2223
)
23-
from typing_extensions import (
24-
Self,
25-
TypeAlias,
26-
)
24+
from typing_extensions import Self
2725

2826
from pandas._libs.tslibs import (
2927
BaseOffset,

pandas-stubs/_libs/tslibs/timestamps.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ from typing import (
1313
ClassVar,
1414
Literal,
1515
SupportsIndex,
16+
TypeAlias,
1617
overload,
1718
)
1819

@@ -26,7 +27,6 @@ from pandas.core.series import Series
2627
from typing_extensions import (
2728
Never,
2829
Self,
29-
TypeAlias,
3030
)
3131

3232
from pandas._libs.tslibs import (

pandas-stubs/_typing.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ from typing import (
1919
Literal,
2020
Protocol,
2121
SupportsIndex,
22+
TypeAlias,
2223
TypedDict,
2324
Union,
2425
overload,
@@ -36,7 +37,6 @@ from pandas.core.series import Series
3637
from pandas.core.tools.datetimes import FulldatetimeDict
3738
from typing_extensions import (
3839
ParamSpec,
39-
TypeAlias,
4040
TypeVar,
4141
override,
4242
)

pandas-stubs/api/typing/__init__.pyi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ from pandas.core.groupby import (
22
DataFrameGroupBy as DataFrameGroupBy,
33
SeriesGroupBy as SeriesGroupBy,
44
)
5-
from pandas.core.indexes.frozen import FrozenList as FrozenList
65
from pandas.core.resample import (
76
DatetimeIndexResamplerGroupby as DatetimeIndexResamplerGroupby,
87
PeriodIndexResamplerGroupby as PeriodIndexResamplerGroupby,

pandas-stubs/core/accessor.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Callable
1+
from collections.abc import Callable
22

33
from pandas._typing import TypeT
44

0 commit comments

Comments
 (0)