Skip to content

Commit

Permalink
Backport PR #50706 on branch 1.5.x (Revert "CI temporarily pin numpy") (
Browse files Browse the repository at this point in the history
#50715)

Backport PR #50706: Revert "CI temporarily pin numpy"

Co-authored-by: Marco Edward Gorelli <33491632+MarcoGorelli@users.noreply.github.com>
  • Loading branch information
meeseeksmachine and MarcoGorelli committed Jan 13, 2023
1 parent b06dd88 commit 060345a
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion asv_bench/asv.conf.json
Expand Up @@ -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": [],
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-310-numpydev.yaml
Expand Up @@ -19,5 +19,5 @@ dependencies:
- "cython"
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
- "--pre"
- "numpy<1.24"
- "numpy"
- "scipy"
2 changes: 1 addition & 1 deletion ci/deps/actions-310.yaml
Expand Up @@ -15,7 +15,7 @@ dependencies:

# required dependencies
- python-dateutil
- numpy<1.24
- numpy
- pytz

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-38-downstream_compat.yaml
Expand Up @@ -16,7 +16,7 @@ dependencies:

# required dependencies
- python-dateutil
- numpy<1.24
- numpy
- pytz

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-38.yaml
Expand Up @@ -15,7 +15,7 @@ dependencies:

# required dependencies
- python-dateutil
- numpy<1.24
- numpy
- pytz

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-39.yaml
Expand Up @@ -15,7 +15,7 @@ dependencies:

# required dependencies
- python-dateutil
- numpy<1.24
- numpy
- pytz

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-pypy-38.yaml
Expand Up @@ -16,6 +16,6 @@ dependencies:
- hypothesis>=5.5.3

# required
- numpy<1.24
- numpy
- python-dateutil
- pytz
2 changes: 1 addition & 1 deletion ci/deps/circle-38-arm64.yaml
Expand Up @@ -15,7 +15,7 @@ dependencies:

# required dependencies
- python-dateutil
- numpy<1.24
- numpy
- pytz

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Expand Up @@ -16,7 +16,7 @@ dependencies:

# required dependencies
- python-dateutil
- numpy<1.24
- numpy
- pytz

# optional dependencies
Expand Down
7 changes: 7 additions & 0 deletions pandas/util/_test_decorators.py
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Expand Up @@ -9,7 +9,7 @@ psutil
pytest-asyncio>=0.17
boto3
python-dateutil
numpy<1.24
numpy
pytz
beautifulsoup4
blosc
Expand Down

0 comments on commit 060345a

Please sign in to comment.