Skip to content

Commit d8f2f55

Browse files
MarcoGorellimeeseeksmachine
authored andcommitted
Backport PR pandas-dev#50706: Revert "CI temporarily pin numpy"
1 parent b69a5ce commit d8f2f55

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
@@ -19,5 +19,5 @@ dependencies:
1919
- "cython"
2020
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
2121
- "--pre"
22-
- "numpy<1.24"
22+
- "numpy"
2323
- "scipy"

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515

1616
# required dependencies
1717
- python-dateutil
18-
- numpy<1.24
18+
- numpy
1919
- pytz
2020

2121
# optional dependencies

ci/deps/actions-38-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616

1717
# required dependencies
1818
- python-dateutil
19-
- numpy<1.24
19+
- numpy
2020
- pytz
2121

2222
# optional dependencies

ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515

1616
# required dependencies
1717
- python-dateutil
18-
- numpy<1.24
18+
- numpy
1919
- pytz
2020

2121
# optional dependencies

ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515

1616
# required dependencies
1717
- python-dateutil
18-
- numpy<1.24
18+
- numpy
1919
- pytz
2020

2121
# optional dependencies

ci/deps/actions-pypy-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ dependencies:
1616
- hypothesis>=5.5.3
1717

1818
# required
19-
- numpy<1.24
19+
- numpy
2020
- python-dateutil
2121
- pytz

ci/deps/circle-38-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515

1616
# required dependencies
1717
- python-dateutil
18-
- numpy<1.24
18+
- numpy
1919
- pytz
2020

2121
# optional dependencies

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616

1717
# required dependencies
1818
- python-dateutil
19-
- numpy<1.24
19+
- numpy
2020
- pytz
2121

2222
# optional dependencies

pandas/util/_test_decorators.py

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

98105
if not min_version:
99106
return mod

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ psutil
99
pytest-asyncio>=0.17
1010
boto3
1111
python-dateutil
12-
numpy<1.24
12+
numpy
1313
pytz
1414
beautifulsoup4
1515
blosc

0 commit comments

Comments
 (0)