File tree Expand file tree Collapse file tree 4 files changed +12
-3
lines changed Expand file tree Collapse file tree 4 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ channels:
3
3
- conda-forge
4
4
dependencies :
5
5
# required
6
- - numpy>=1.18.5
6
+ - numpy>=1.18.5, <1.22.0
7
7
- python=3.8
8
8
- python-dateutil>=2.8.1
9
9
- pytz
Original file line number Diff line number Diff line change 9
9
np_version_under1p19 = _nlv < Version ("1.19" )
10
10
np_version_under1p20 = _nlv < Version ("1.20" )
11
11
np_version_under1p22 = _nlv < Version ("1.22" )
12
+ np_version_is1p22 = _nlv == Version ("1.22" )
12
13
is_numpy_dev = _nlv .dev is not None
13
14
_min_numpy_ver = "1.18.5"
14
15
Original file line number Diff line number Diff line change 3
3
import numpy as np
4
4
import pytest
5
5
6
+ from pandas .compat .numpy import np_version_is1p22
6
7
import pandas .util ._test_decorators as td
7
8
8
9
import pandas as pd
@@ -252,7 +253,7 @@ def test_alignment_deprecation():
252
253
253
254
254
255
@td .skip_if_no ("numba" )
255
- def test_alignment_deprecation_many_inputs ():
256
+ def test_alignment_deprecation_many_inputs (request ):
256
257
# https://github.com/pandas-dev/pandas/issues/39184
257
258
# test that the deprecation also works with > 2 inputs -> using a numba
258
259
# written ufunc for this because numpy itself doesn't have such ufuncs
@@ -261,6 +262,13 @@ def test_alignment_deprecation_many_inputs():
261
262
vectorize ,
262
263
)
263
264
265
+ if np_version_is1p22 :
266
+ mark = pytest .mark .xfail (
267
+ reason = "ufunc 'my_ufunc' did not contain a loop with signature matching "
268
+ "types" ,
269
+ )
270
+ request .node .add_marker (mark )
271
+
264
272
@vectorize ([float64 (float64 , float64 , float64 )])
265
273
def my_ufunc (x , y , z ):
266
274
return x + y + z
Original file line number Diff line number Diff line change 1
1
# This file is auto-generated from environment.yml, do not modify.
2
2
# See that file for comments about the need/usage of each dependency.
3
3
4
- numpy >= 1.18.5
4
+ numpy >= 1.18.5 , < 1.22.0
5
5
python-dateutil >= 2.8.1
6
6
pytz
7
7
asv
You can’t perform that action at this time.
0 commit comments