Skip to content

Commit 20d8e2b

Browse files
MarcoGorelliphofl
authored andcommitted
Revert "CI temporarily pin numpy" (pandas-dev#50706)
* Revert "CI: Temporarily pin numpy (pandas-dev#50356)" This reverts commit f31da23. * maybe fixup test collection * remove np_version_gte1p24 Co-authored-by: MarcoGorelli <>
1 parent e95a46a commit 20d8e2b

11 files changed

+17
-10
lines changed

asv_bench/asv.conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
// pip (with all the conda available packages installed first,
4242
// followed by the pip installed packages).
4343
"matrix": {
44-
"numpy": ["1.23.5"], // https://github.com/pandas-dev/pandas/pull/50356
44+
"numpy": [],
4545
"Cython": ["0.29.32"],
4646
"matplotlib": [],
4747
"sqlalchemy": [],

ci/deps/actions-310-numpydev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ dependencies:
2222
- "cython"
2323
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
2424
- "--pre"
25-
- "numpy<1.24"
25+
- "numpy"
2626
- "scipy"

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

ci/deps/actions-38-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919

2020
# required dependencies
2121
- python-dateutil
22-
- numpy<1.24
22+
- numpy
2323
- pytz
2424

2525
# optional dependencies

ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

ci/deps/actions-pypy-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ dependencies:
1919
- hypothesis>=6.34.2
2020

2121
# required
22-
- numpy<1.24
22+
- numpy
2323
- python-dateutil
2424
- pytz

ci/deps/circle-38-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020

2121
# required dependencies
2222
- python-dateutil
23-
- numpy<1.24
23+
- numpy
2424
- pytz
2525

2626
# optional dependencies

pandas/util/_test_decorators.py

+7
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ def safe_import(mod_name: str, min_version: str | None = None):
9595
mod = __import__(mod_name)
9696
except ImportError:
9797
return False
98+
except SystemError:
99+
# TODO: numba is incompatible with numpy 1.24+.
100+
# Once that's fixed, this block should be removed.
101+
if mod_name == "numba":
102+
return False
103+
else:
104+
raise
98105

99106
if not min_version:
100107
return mod

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ psutil
1111
pytest-asyncio>=0.17
1212
coverage
1313
python-dateutil
14-
numpy<1.24
14+
numpy
1515
pytz
1616
beautifulsoup4
1717
blosc

0 commit comments

Comments
 (0)