Backport PR pandas-dev#56682: CLN: NEP 50 followups

meeseeksmachine · Dec 29, 2023 · f7bf15f · f7bf15f
1 parent 80ad64f
commit f7bf15f
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -92,7 +92,7 @@ jobs:
           - name: "Numpy Dev"
             env_file: actions-311-numpydev.yaml
             pattern: "not slow and not network and not single_cpu"
-            test_args: "-W error::FutureWarning"
+            test_args: "-W error::DeprecationWarning -W error::FutureWarning"
           - name: "Pyarrow Nightly"
             env_file: actions-311-pyarrownightly.yaml
             pattern: "not slow and not network and not single_cpu"

diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml
@@ -21,7 +21,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml
@@ -18,7 +18,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
   - pip
 

diff --git a/ci/deps/actions-311-sanitizers.yaml b/ci/deps/actions-311-sanitizers.yaml
@@ -22,7 +22,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # pandas dependencies

diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml
@@ -22,7 +22,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil=2.8.2
-  - numpy=1.22.4, <2
+  - numpy=1.22.4
   - pytz=2020.1
 
   # optional dependencies

diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml
@@ -20,7 +20,7 @@ dependencies:
   - hypothesis>=6.46.1
 
   # required
-  - numpy<2
+  - numpy
   - python-dateutil
   - pytz
   - pip:

diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml
@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy<2
+  - numpy
   - pytz
 
   # optional dependencies

diff --git a/pandas/core/dtypes/cast.py b/pandas/core/dtypes/cast.py
@@ -1332,7 +1332,7 @@ def find_result_type(left_dtype: DtypeObj, right: Any) -> DtypeObj:
                 right = left_dtype
             elif (
                 not np.issubdtype(left_dtype, np.unsignedinteger)
-                and 0 < right <= 2 ** (8 * right_dtype.itemsize - 1) - 1
+                and 0 < right <= np.iinfo(right_dtype).max
             ):
                 # If left dtype isn't unsigned, check if it fits in the signed dtype
                 right = np.dtype(f"i{right_dtype.itemsize}")
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ dependencies: @@
       # required dependencies
       - python-dateutil
-      - numpy<2
+      - numpy
       - pytz
       # optional dependencies
@@ Expand Down @@