Skip to content

Commit 3c80277

Browse files
yogendrasoniBlake Hawkins
authored and
Blake Hawkins
committed
fix pandas-dev#28926 mypy error in pandas\tests\arrays\test_array.py (pandas-dev#28970)
1 parent c8dd72a commit 3c80277

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pandas/core/arrays/period.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,9 @@ def _raise_on_incompatible(left, right):
831831

832832

833833
def period_array(
834-
data: Sequence[Optional[Period]], freq: Optional[Tick] = None, copy: bool = False
834+
data: Sequence[Optional[Period]],
835+
freq: Optional[Union[str, Tick]] = None,
836+
copy: bool = False,
835837
) -> PeriodArray:
836838
"""
837839
Construct a new PeriodArray from a sequence of Period scalars.

setup.cfg

+5-6
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,17 @@ ignore_errors=True
136136
[mypy-pandas.tests.arithmetic.test_datetime64]
137137
ignore_errors=True
138138

139-
[mypy-pandas.tests.arrays.test_array]
140-
ignore_errors=True
141-
142139
[mypy-pandas.tests.arrays.test_datetimelike]
143140
ignore_errors=True
144141

142+
<<<<<<< HEAD
145143
[mypy-pandas.tests.arrays.test_period]
146144
ignore_errors=True
147145

146+
=======
147+
[mypy-pandas.tests.dtypes.test_common]
148+
ignore_errors=True
149+
>>>>>>> 6c898e6a5... fix #28926 mypy error in pandas\tests\arrays\test_array.py (#28970)
148150

149151
[mypy-pandas.tests.extension.decimal.test_decimal]
150152
ignore_errors=True
@@ -188,9 +190,6 @@ ignore_errors=True
188190
[mypy-pandas.tests.series.test_operators]
189191
ignore_errors=True
190192

191-
[mypy-pandas.tests.test_base]
192-
ignore_errors=True
193-
194193
[mypy-pandas.tests.tseries.offsets.test_offsets]
195194
ignore_errors=True
196195

0 commit comments

Comments
 (0)