Skip to content

Commit 3876d1e

Browse files
Backport PR #47670 on branch 1.4.x (CI: Fix npdev build post Cython annotation change) (#47709)
Backport PR #47670: CI: Fix npdev build post Cython annotation change Co-authored-by: Matthew Roeschke <[email protected]>
1 parent 0d96237 commit 3876d1e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pandas/_libs/arrays.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ cdef class NDArrayBacked:
157157
return self._from_backing_data(res_values)
158158

159159
# TODO: pass NPY_MAXDIMS equiv to axis=None?
160-
def repeat(self, repeats, axis: int = 0):
160+
def repeat(self, repeats, axis: int | np.integer = 0):
161161
if axis is None:
162162
axis = 0
163163
res_values = cnp.PyArray_Repeat(self._ndarray, repeats, <int>axis)

pandas/_libs/tslibs/period.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ cdef class _Period(PeriodMixin):
16541654
return freq
16551655

16561656
@classmethod
1657-
def _from_ordinal(cls, ordinal: int, freq) -> "Period":
1657+
def _from_ordinal(cls, ordinal: int64_t, freq) -> "Period":
16581658
"""
16591659
Fast creation from an ordinal and freq that are already validated!
16601660
"""

pandas/tests/io/parser/test_quoting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_bad_quote_char(all_parsers, kwargs, msg):
3838
@pytest.mark.parametrize(
3939
"quoting,msg",
4040
[
41-
("foo", '"quoting" must be an integer'),
41+
("foo", '"quoting" must be an integer|Argument'),
4242
(5, 'bad "quoting" value'), # quoting must be in the range [0, 3]
4343
],
4444
)

0 commit comments

Comments
 (0)