Skip to content

Backport PR #47670 on branch 1.4.x (CI: Fix npdev build post Cython annotation change) #47709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandas/_libs/arrays.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ cdef class NDArrayBacked:
return self._from_backing_data(res_values)

# TODO: pass NPY_MAXDIMS equiv to axis=None?
def repeat(self, repeats, axis: int = 0):
def repeat(self, repeats, axis: int | np.integer = 0):
if axis is None:
axis = 0
res_values = cnp.PyArray_Repeat(self._ndarray, repeats, <int>axis)
Expand Down
2 changes: 1 addition & 1 deletion pandas/_libs/tslibs/period.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1654,7 +1654,7 @@ cdef class _Period(PeriodMixin):
return freq

@classmethod
def _from_ordinal(cls, ordinal: int, freq) -> "Period":
def _from_ordinal(cls, ordinal: int64_t, freq) -> "Period":
"""
Fast creation from an ordinal and freq that are already validated!
"""
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/parser/test_quoting.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def test_bad_quote_char(all_parsers, kwargs, msg):
@pytest.mark.parametrize(
"quoting,msg",
[
("foo", '"quoting" must be an integer'),
("foo", '"quoting" must be an integer|Argument'),
(5, 'bad "quoting" value'), # quoting must be in the range [0, 3]
],
)
Expand Down