File tree 2 files changed +8
-7
lines changed
2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -831,7 +831,9 @@ def _raise_on_incompatible(left, right):
831
831
832
832
833
833
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 ,
835
837
) -> PeriodArray :
836
838
"""
837
839
Construct a new PeriodArray from a sequence of Period scalars.
Original file line number Diff line number Diff line change @@ -136,15 +136,17 @@ ignore_errors=True
136
136
[mypy-pandas.tests.arithmetic.test_datetime64]
137
137
ignore_errors =True
138
138
139
- [mypy-pandas.tests.arrays.test_array]
140
- ignore_errors =True
141
-
142
139
[mypy-pandas.tests.arrays.test_datetimelike]
143
140
ignore_errors =True
144
141
142
+ <<<<<<< HEAD
145
143
[mypy-pandas.tests.arrays.test_period]
146
144
ignore_errors =True
147
145
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)
148
150
149
151
[mypy-pandas.tests.extension.decimal.test_decimal]
150
152
ignore_errors =True
@@ -188,9 +190,6 @@ ignore_errors=True
188
190
[mypy-pandas.tests.series.test_operators]
189
191
ignore_errors =True
190
192
191
- [mypy-pandas.tests.test_base]
192
- ignore_errors =True
193
-
194
193
[mypy-pandas.tests.tseries.offsets.test_offsets]
195
194
ignore_errors =True
196
195
You can’t perform that action at this time.
0 commit comments