Skip to content

Backport PR #45597 on branch 1.4.x (CI: Fix failing CI for test_alignment_deprecation_many_inputs) #45600

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.

Sign up for GitHub

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
merged 1 commit into from
Jan 24, 2022
Merged

Backport PR #45597 on branch 1.4.x (CI: Fix failing CI for test_alignment_deprecation_many_inputs) #45600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/compat/numpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
np_version_under1p19 = _nlv < Version("1.19")
np_version_under1p20 = _nlv < Version("1.20")
np_version_under1p22 = _nlv < Version("1.22")
np_version_is1p22 = _nlv == Version("1.22")
np_version_gte1p22 = _nlv >= Version("1.22")
is_numpy_dev = _nlv.dev is not None
_min_numpy_ver = "1.18.5"

Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/frame/test_ufunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np
import pytest

from pandas.compat.numpy import np_version_is1p22
from pandas.compat.numpy import np_version_gte1p22
import pandas.util._test_decorators as td

import pandas as pd
Expand Down Expand Up @@ -262,7 +262,7 @@ def test_alignment_deprecation_many_inputs(request):
vectorize,
)

if np_version_is1p22:
if np_version_gte1p22:
mark = pytest.mark.xfail(
reason="ufunc 'my_ufunc' did not contain a loop with signature matching "
"types",
Expand Down