Skip to content

Commit 0df5b0b

Browse files
authored
REF: Remove Numba compat pre 0.50.1 (#43266)
* CLN: Pre Numba 0.46.0 compat * Remove other unneeded min references
1 parent d15a210 commit 0df5b0b

File tree

7 files changed

+26
-35
lines changed

7 files changed

+26
-35
lines changed

pandas/core/util/numba_.py

+1-8
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
from pandas.compat._optional import import_optional_dependency
1010
from pandas.errors import NumbaUtilError
1111

12-
from pandas.util.version import Version
13-
1412
GLOBAL_USE_NUMBA: bool = False
1513
NUMBA_FUNC_CACHE: dict[tuple[Callable, str], Callable] = {}
1614

@@ -87,12 +85,7 @@ def jit_user_function(
8785
"""
8886
numba = import_optional_dependency("numba")
8987

90-
if Version(numba.__version__) >= Version("0.49.0"):
91-
is_jitted = numba.extending.is_jitted(func)
92-
else:
93-
is_jitted = isinstance(func, numba.targets.registry.CPUDispatcher)
94-
95-
if is_jitted:
88+
if numba.extending.is_jitted(func):
9689
# Don't jit a user passed jitted function
9790
numba_func = func
9891
else:

pandas/tests/frame/test_ufunc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def test_alignment_deprecation():
251251
tm.assert_frame_equal(result, expected)
252252

253253

254-
@td.skip_if_no("numba", "0.46.0")
254+
@td.skip_if_no("numba")
255255
def test_alignment_deprecation_many_inputs():
256256
# https://github.com/pandas-dev/pandas/issues/39184
257257
# test that the deprecation also works with > 2 inputs -> using a numba

pandas/tests/groupby/aggregate/test_numba.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from pandas.core.util.numba_ import NUMBA_FUNC_CACHE
1616

1717

18-
@td.skip_if_no("numba", "0.46.0")
18+
@td.skip_if_no("numba")
1919
def test_correct_function_signature():
2020
def incorrect_function(x):
2121
return sum(x) * 2.7
@@ -31,7 +31,7 @@ def incorrect_function(x):
3131
data.groupby("key")["data"].agg(incorrect_function, engine="numba")
3232

3333

34-
@td.skip_if_no("numba", "0.46.0")
34+
@td.skip_if_no("numba")
3535
def test_check_nopython_kwargs():
3636
def incorrect_function(x, **kwargs):
3737
return sum(x) * 2.7
@@ -47,7 +47,7 @@ def incorrect_function(x, **kwargs):
4747
data.groupby("key")["data"].agg(incorrect_function, engine="numba", a=1)
4848

4949

50-
@td.skip_if_no("numba", "0.46.0")
50+
@td.skip_if_no("numba")
5151
@pytest.mark.filterwarnings("ignore:\\nThe keyword argument")
5252
# Filter warnings when parallel=True and the function can't be parallelized by Numba
5353
@pytest.mark.parametrize("jit", [True, False])
@@ -76,7 +76,7 @@ def func_numba(values, index):
7676
tm.assert_equal(result, expected)
7777

7878

79-
@td.skip_if_no("numba", "0.46.0")
79+
@td.skip_if_no("numba")
8080
@pytest.mark.filterwarnings("ignore:\\nThe keyword argument")
8181
# Filter warnings when parallel=True and the function can't be parallelized by Numba
8282
@pytest.mark.parametrize("jit", [True, False])
@@ -121,7 +121,7 @@ def func_2(values, index):
121121
tm.assert_equal(result, expected)
122122

123123

124-
@td.skip_if_no("numba", "0.46.0")
124+
@td.skip_if_no("numba")
125125
def test_use_global_config():
126126
def func_1(values, index):
127127
return np.mean(values) - 3.4
@@ -136,7 +136,7 @@ def func_1(values, index):
136136
tm.assert_frame_equal(expected, result)
137137

138138

139-
@td.skip_if_no("numba", "0.46.0")
139+
@td.skip_if_no("numba")
140140
@pytest.mark.parametrize(
141141
"agg_func",
142142
[
@@ -158,7 +158,7 @@ def test_multifunc_notimplimented(agg_func):
158158
grouped[1].agg(agg_func, engine="numba")
159159

160160

161-
@td.skip_if_no("numba", "0.46.0")
161+
@td.skip_if_no("numba")
162162
def test_args_not_cached():
163163
# GH 41647
164164
def sum_last(values, index, n):
@@ -175,7 +175,7 @@ def sum_last(values, index, n):
175175
tm.assert_series_equal(result, expected)
176176

177177

178-
@td.skip_if_no("numba", "0.46.0")
178+
@td.skip_if_no("numba")
179179
def test_index_data_correctly_passed():
180180
# GH 43133
181181
def f(values, index):

pandas/tests/groupby/transform/test_numba.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pandas.core.util.numba_ import NUMBA_FUNC_CACHE
1313

1414

15-
@td.skip_if_no("numba", "0.46.0")
15+
@td.skip_if_no("numba")
1616
def test_correct_function_signature():
1717
def incorrect_function(x):
1818
return x + 1
@@ -28,7 +28,7 @@ def incorrect_function(x):
2828
data.groupby("key")["data"].transform(incorrect_function, engine="numba")
2929

3030

31-
@td.skip_if_no("numba", "0.46.0")
31+
@td.skip_if_no("numba")
3232
def test_check_nopython_kwargs():
3333
def incorrect_function(x, **kwargs):
3434
return x + 1
@@ -44,7 +44,7 @@ def incorrect_function(x, **kwargs):
4444
data.groupby("key")["data"].transform(incorrect_function, engine="numba", a=1)
4545

4646

47-
@td.skip_if_no("numba", "0.46.0")
47+
@td.skip_if_no("numba")
4848
@pytest.mark.filterwarnings("ignore:\\nThe keyword argument")
4949
# Filter warnings when parallel=True and the function can't be parallelized by Numba
5050
@pytest.mark.parametrize("jit", [True, False])
@@ -73,7 +73,7 @@ def func(values, index):
7373
tm.assert_equal(result, expected)
7474

7575

76-
@td.skip_if_no("numba", "0.46.0")
76+
@td.skip_if_no("numba")
7777
@pytest.mark.filterwarnings("ignore:\\nThe keyword argument")
7878
# Filter warnings when parallel=True and the function can't be parallelized by Numba
7979
@pytest.mark.parametrize("jit", [True, False])
@@ -118,7 +118,7 @@ def func_2(values, index):
118118
tm.assert_equal(result, expected)
119119

120120

121-
@td.skip_if_no("numba", "0.46.0")
121+
@td.skip_if_no("numba")
122122
def test_use_global_config():
123123
def func_1(values, index):
124124
return values + 1
@@ -133,7 +133,7 @@ def func_1(values, index):
133133
tm.assert_frame_equal(expected, result)
134134

135135

136-
@td.skip_if_no("numba", "0.46.0")
136+
@td.skip_if_no("numba")
137137
@pytest.mark.parametrize(
138138
"agg_func", [["min", "max"], "min", {"B": ["min", "max"], "C": "sum"}]
139139
)
@@ -149,7 +149,7 @@ def test_multifunc_notimplimented(agg_func):
149149
grouped[1].transform(agg_func, engine="numba")
150150

151151

152-
@td.skip_if_no("numba", "0.46.0")
152+
@td.skip_if_no("numba")
153153
def test_args_not_cached():
154154
# GH 41647
155155
def sum_last(values, index, n):
@@ -166,7 +166,7 @@ def sum_last(values, index, n):
166166
tm.assert_series_equal(result, expected)
167167

168168

169-
@td.skip_if_no("numba", "0.46.0")
169+
@td.skip_if_no("numba")
170170
def test_index_data_correctly_passed():
171171
# GH 43133
172172
def f(values, index):

pandas/tests/window/conftest.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,15 @@ def ignore_na(request):
124124
return request.param
125125

126126

127-
@pytest.fixture(
128-
params=[pytest.param("numba", marks=td.skip_if_no("numba", "0.46.0")), "cython"]
129-
)
127+
@pytest.fixture(params=[pytest.param("numba", marks=td.skip_if_no("numba")), "cython"])
130128
def engine(request):
131129
"""engine keyword argument for rolling.apply"""
132130
return request.param
133131

134132

135133
@pytest.fixture(
136134
params=[
137-
pytest.param(("numba", True), marks=td.skip_if_no("numba", "0.46.0")),
135+
pytest.param(("numba", True), marks=td.skip_if_no("numba")),
138136
("cython", True),
139137
("cython", False),
140138
]

pandas/tests/window/test_numba.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from pandas.core.util.numba_ import NUMBA_FUNC_CACHE
1515

1616

17-
@td.skip_if_no("numba", "0.46.0")
17+
@td.skip_if_no("numba")
1818
@pytest.mark.filterwarnings("ignore:\\nThe keyword argument")
1919
# Filter warnings when parallel=True and the function can't be parallelized by Numba
2020
class TestEngine:
@@ -150,7 +150,7 @@ def add(values, x):
150150
tm.assert_frame_equal(result, expected)
151151

152152

153-
@td.skip_if_no("numba", "0.46.0")
153+
@td.skip_if_no("numba")
154154
class TestEWMMean:
155155
@pytest.mark.parametrize(
156156
"grouper", [lambda x: x, lambda x: x.groupby("A")], ids=["None", "groupby"]
@@ -229,7 +229,7 @@ def test_cython_vs_numba_times(self, grouper, nogil, parallel, nopython, ignore_
229229
tm.assert_frame_equal(result, expected)
230230

231231

232-
@td.skip_if_no("numba", "0.46.0")
232+
@td.skip_if_no("numba")
233233
def test_use_global_config():
234234
def f(x):
235235
return np.mean(x) + 2
@@ -241,15 +241,15 @@ def f(x):
241241
tm.assert_series_equal(expected, result)
242242

243243

244-
@td.skip_if_no("numba", "0.46.0")
244+
@td.skip_if_no("numba")
245245
def test_invalid_kwargs_nopython():
246246
with pytest.raises(NumbaUtilError, match="numba does not support kwargs with"):
247247
Series(range(1)).rolling(1).apply(
248248
lambda x: x, kwargs={"a": 1}, engine="numba", raw=True
249249
)
250250

251251

252-
@td.skip_if_no("numba", "0.46.0")
252+
@td.skip_if_no("numba")
253253
@pytest.mark.slow
254254
@pytest.mark.filterwarnings("ignore:\\nThe keyword argument")
255255
# Filter warnings when parallel=True and the function can't be parallelized by Numba

pandas/tests/window/test_online.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import pandas._testing as tm
1111

1212

13-
@td.skip_if_no("numba", "0.46.0")
13+
@td.skip_if_no("numba")
1414
@pytest.mark.filterwarnings("ignore:\\nThe keyword argument")
1515
class TestEWM:
1616
def test_invalid_update(self):

0 commit comments

Comments
 (0)