Skip to content

Commit 829e4c3

Browse files
committed
Backport PR pandas-dev#59553: CI: Uninstall nomkl & 32 bit Interval tests
1 parent 71ad173 commit 829e4c3

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

.github/actions/build_pandas/action.yml

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ runs:
2828
fi
2929
shell: bash -el {0}
3030

31+
- name: Uninstall nomkl
32+
run: |
33+
if conda list nomkl | grep nomkl 1>/dev/null; then
34+
conda remove nomkl -y
35+
fi
36+
shell: bash -el {0}
37+
3138
- name: Build Pandas
3239
run: |
3340
export CFLAGS="$CFLAGS ${{ inputs.cflags_adds }}"

pandas/tests/indexes/interval/test_interval_tree.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
import pytest
55

66
from pandas._libs.interval import IntervalTree
7-
from pandas.compat import IS64
7+
from pandas.compat import (
8+
IS64,
9+
WASM,
10+
)
811

912
import pandas._testing as tm
1013

@@ -190,7 +193,7 @@ def test_construction_overflow(self):
190193
expected = (50 + np.iinfo(np.int64).max) / 2
191194
assert result == expected
192195

193-
@pytest.mark.xfail(not IS64, reason="GH 23440")
196+
@pytest.mark.xfail(WASM, reason="GH 23440")
194197
@pytest.mark.parametrize(
195198
"left, right, expected",
196199
[

pandas/tests/indexing/interval/test_interval_new.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.compat import IS64
6+
from pandas.compat import WASM
77

88
from pandas import (
99
Index,
@@ -211,7 +211,7 @@ def test_loc_getitem_missing_key_error_message(
211211
obj.loc[[4, 5, 6]]
212212

213213

214-
@pytest.mark.xfail(not IS64, reason="GH 23440")
214+
@pytest.mark.xfail(WASM, reason="GH 23440")
215215
@pytest.mark.parametrize(
216216
"intervals",
217217
[

0 commit comments

Comments
 (0)