Skip to content

Commit d36c539

Browse files
lithomas1cbpygit
authored andcommitted
CLN: NEP 50 followups (pandas-dev#56682)
1 parent cb4fd95 commit d36c539

12 files changed

+12
-12
lines changed

.github/workflows/unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: "Numpy Dev"
9393
env_file: actions-311-numpydev.yaml
9494
pattern: "not slow and not network and not single_cpu"
95-
test_args: "-W error::FutureWarning"
95+
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
9696
- name: "Pyarrow Nightly"
9797
env_file: actions-311-pyarrownightly.yaml
9898
pattern: "not slow and not network and not single_cpu"

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<2
23+
- numpy
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<2
24+
- numpy
2525
- pytz
2626

2727
# optional dependencies

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

ci/deps/actions-311-sanitizers.yaml

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

2323
# required dependencies
2424
- python-dateutil
25-
- numpy<2
25+
- numpy
2626
- pytz
2727

2828
# pandas dependencies

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<2
23+
- numpy
2424
- pytz
2525

2626
# optional dependencies

ci/deps/actions-312.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<2
23+
- numpy
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, <2
25+
- numpy=1.22.4
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<2
23+
- numpy
2424
- pytz
2525

2626
# optional dependencies

ci/deps/actions-pypy-39.yaml

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

2222
# required
23-
- numpy<2
23+
- numpy
2424
- python-dateutil
2525
- pytz
2626
- 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<2
23+
- numpy
2424
- pytz
2525

2626
# optional dependencies

pandas/core/dtypes/cast.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1332,7 +1332,7 @@ def find_result_type(left_dtype: DtypeObj, right: Any) -> DtypeObj:
13321332
right = left_dtype
13331333
elif (
13341334
not np.issubdtype(left_dtype, np.unsignedinteger)
1335-
and 0 < right <= 2 ** (8 * right_dtype.itemsize - 1) - 1
1335+
and 0 < right <= np.iinfo(right_dtype).max
13361336
):
13371337
# If left dtype isn't unsigned, check if it fits in the signed dtype
13381338
right = np.dtype(f"i{right_dtype.itemsize}")

0 commit comments

Comments
 (0)