diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index aef542e8c9f16..b1ea2682b7ea7 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -41,7 +41,7 @@ // pip (with all the conda available packages installed first, // followed by the pip installed packages). "matrix": { - "numpy": ["1.23.5"], // https://github.com/pandas-dev/pandas/pull/50356 + "numpy": [], "Cython": ["0.29.32"], "matplotlib": [], "sqlalchemy": [], diff --git a/ci/deps/actions-310-numpydev.yaml b/ci/deps/actions-310-numpydev.yaml index 066ac7f013654..ef20c2aa889b9 100644 --- a/ci/deps/actions-310-numpydev.yaml +++ b/ci/deps/actions-310-numpydev.yaml @@ -19,5 +19,5 @@ dependencies: - "cython" - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple" - "--pre" - - "numpy<1.24" + - "numpy" - "scipy" diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 397b5d8139336..deb23d435bddf 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -15,7 +15,7 @@ dependencies: # required dependencies - python-dateutil - - numpy<1.24 + - numpy - pytz # optional dependencies diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index a19f5bd8af878..06ffafeb70570 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -16,7 +16,7 @@ dependencies: # required dependencies - python-dateutil - - numpy<1.24 + - numpy - pytz # optional dependencies diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 4d6e228cf21ab..222da40ea9eea 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -15,7 +15,7 @@ dependencies: # required dependencies - python-dateutil - - numpy<1.24 + - numpy - pytz # optional dependencies diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 8e27f71ba0c01..1c60e8ad6d78a 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -15,7 +15,7 @@ dependencies: # required dependencies - python-dateutil - - numpy<1.24 + - numpy - pytz # optional dependencies diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index c4f45f32a5f4c..e06b992acc191 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -16,6 +16,6 @@ dependencies: - hypothesis>=5.5.3 # required - - numpy<1.24 + - numpy - python-dateutil - pytz diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index b65162c0c0f6e..263521fb74879 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -15,7 +15,7 @@ dependencies: # required dependencies - python-dateutil - - numpy<1.24 + - numpy - pytz # optional dependencies diff --git a/environment.yml b/environment.yml index a8951e056005c..20f839db9ad60 100644 --- a/environment.yml +++ b/environment.yml @@ -16,7 +16,7 @@ dependencies: # required dependencies - python-dateutil - - numpy<1.24 + - numpy - pytz # optional dependencies diff --git a/pandas/util/_test_decorators.py b/pandas/util/_test_decorators.py index 4a4f27f6c7906..dc49dc6adf378 100644 --- a/pandas/util/_test_decorators.py +++ b/pandas/util/_test_decorators.py @@ -94,6 +94,13 @@ def safe_import(mod_name: str, min_version: str | None = None): mod = __import__(mod_name) except ImportError: return False + except SystemError: + # TODO: numba is incompatible with numpy 1.24+. + # Once that's fixed, this block should be removed. + if mod_name == "numba": + return False + else: + raise if not min_version: return mod diff --git a/requirements-dev.txt b/requirements-dev.txt index 9c45bb2d6e766..95291e4ab5452 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,7 +9,7 @@ psutil pytest-asyncio>=0.17 boto3 python-dateutil -numpy<1.24 +numpy pytz beautifulsoup4 blosc