Skip to content

Commit 2efe182

Browse files
lithomas1meeseeksmachine
authored andcommitted
Backport PR pandas-dev#55488: BLD: Pin numpy to < 2
1 parent 423e7b9 commit 2efe182

13 files changed

+17
-17
lines changed

.github/actions/build_pandas/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ runs:
2525
- name: Build Pandas
2626
run: |
2727
if [[ ${{ inputs.editable }} == "true" ]]; then
28-
pip install -e . --no-build-isolation -v
28+
pip install -e . --no-build-isolation -v --no-deps
2929
else
30-
pip install . --no-build-isolation -v
30+
pip install . --no-build-isolation -v --no-deps
3131
fi
3232
shell: bash -el {0}

.github/workflows/unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ jobs:
348348
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
349349
python -m pip install versioneer[toml]
350350
python -m pip install python-dateutil pytz tzdata "cython<3.0.3" hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
351-
python -m pip install -ve . --no-build-isolation --no-index
351+
python -m pip install -ve . --no-build-isolation --no-index --no-deps
352352
python -m pip list
353353
354354
- name: Run Tests

ci/deps/actions-310.yaml

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

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

2626
# optional dependencies

ci/deps/actions-311-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies:
2121

2222
# required dependencies
2323
- python-dateutil
24-
- numpy
24+
- numpy<2
2525
- pytz
2626

2727
# optional dependencies

ci/deps/actions-311-pyarrownightly.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
22+
- numpy<2
2323
- pytz
2424
- pip
2525

ci/deps/actions-311.yaml

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

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

2626
# optional dependencies

ci/deps/actions-39-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222

2323
# required dependencies
2424
- python-dateutil=2.8.2
25-
- numpy=1.22.4
25+
- numpy=1.22.4, <2
2626
- pytz=2020.1
2727

2828
# optional dependencies

ci/deps/actions-39.yaml

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

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

2626
# optional dependencies

ci/deps/actions-pypy-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies:
2121
- hypothesis>=6.46.1
2222

2323
# required
24-
- numpy
24+
- numpy<2
2525
- python-dateutil
2626
- pytz
2727
- pip:

ci/deps/circle-310-arm64.yaml

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

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

2626
# optional dependencies

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies:
2121

2222
# required dependencies
2323
- python-dateutil
24-
- numpy
24+
- numpy<2
2525
- pytz
2626

2727
# optional dependencies

pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ requires = [
1010
# we don't want to force users to compile with 1.25 though
1111
# (Ideally, in the future, though, oldest-supported-numpy can be dropped when our min numpy is 1.25.x)
1212
"oldest-supported-numpy>=2022.8.16; python_version<'3.12'",
13-
"numpy>=1.26.0; python_version>='3.12'",
13+
"numpy>=1.26.0,<2; python_version>='3.12'",
1414
"versioneer[toml]"
1515
]
1616

@@ -29,9 +29,9 @@ authors = [
2929
license = {file = 'LICENSE'}
3030
requires-python = '>=3.9'
3131
dependencies = [
32-
"numpy>=1.22.4; python_version<'3.11'",
33-
"numpy>=1.23.2; python_version=='3.11'",
34-
"numpy>=1.26.0; python_version>='3.12'",
32+
"numpy>=1.22.4,<2; python_version<'3.11'",
33+
"numpy>=1.23.2,<2; python_version=='3.11'",
34+
"numpy>=1.26.0,<2; python_version>='3.12'",
3535
"python-dateutil>=2.8.2",
3636
"pytz>=2020.1",
3737
"tzdata>=2022.1"

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pytest-xdist>=2.2.0
1212
pytest-asyncio>=0.17.0
1313
coverage
1414
python-dateutil
15-
numpy
15+
numpy<2
1616
pytz
1717
beautifulsoup4>=4.11.1
1818
blosc

0 commit comments

Comments
 (0)