Merge branch 'main' of https://github.com/pandas-dev/pandas into cln_enforce_na_validation

Author: rhshadrach

.github/workflows/unit-tests.yml

@@ -243,7 +243,7 @@ jobs:
           . ~/virtualenvs/pandas-dev/bin/activate
           python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
           python -m pip install numpy -Csetup-args="-Dallow-noblas=true"
-          python -m pip install --no-cache-dir versioneer[toml] cython==3.0.10 python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.116.0
+          python -m pip install --no-cache-dir versioneer[toml] cython==3.0.10 python-dateutil pytest>=8.3.4 pytest-xdist>=3.6.1 hypothesis>=6.116.0
           python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
           python -m pip list --no-cache-dir
           PANDAS_CI=1 python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
@@ -280,7 +280,7 @@ jobs:
           /opt/python/cp313-cp313/bin/python -m venv ~/virtualenvs/pandas-dev
           . ~/virtualenvs/pandas-dev/bin/activate
           python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
-          python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.116.0
+          python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=8.3.4 pytest-xdist>=3.6.1 hypothesis>=6.116.0
           python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
           python -m pip list --no-cache-dir
 
@@ -352,7 +352,7 @@ jobs:
           python --version
           python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
           python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
-          python -m pip install versioneer[toml] python-dateutil tzdata cython hypothesis>=6.116.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
+          python -m pip install versioneer[toml] python-dateutil tzdata cython hypothesis>=6.116.0 pytest>=8.3.4 pytest-xdist>=3.6.1 pytest-cov
           python -m pip install -ve . --no-build-isolation --no-index --no-deps -Csetup-args="--werror"
           python -m pip list
 

.github/workflows/wheels.yml

@@ -162,7 +162,7 @@ jobs:
         run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.1.4
+        uses: pypa/cibuildwheel@v3.2.0
         with:
          package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
         env:
@@ -239,7 +239,7 @@ jobs:
 
     steps:
       - name: Download all artefacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           path: dist          # everything lands in ./dist/**
 

Dockerfile

@@ -1,6 +1,9 @@
 FROM python:3.11.13
 WORKDIR /home/pandas
 
+# https://docs.docker.com/reference/dockerfile/#automatic-platform-args-in-the-global-scope
+ARG TARGETPLATFORM
+
 RUN apt-get update && \
     apt-get --no-install-recommends -y upgrade && \
     apt-get --no-install-recommends -y install \
@@ -13,7 +16,14 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 COPY requirements-dev.txt /tmp
-RUN python -m pip install --no-cache-dir --upgrade pip && \
+
+RUN case "$TARGETPLATFORM" in \
+    linux/arm*) \
+        # Drop PyQt5 for ARM GH#61037
+        sed -i "/^pyqt5/Id" /tmp/requirements-dev.txt \
+        ;; \
+    esac && \
+    python -m pip install --no-cache-dir --upgrade pip && \
     python -m pip install --no-cache-dir -r /tmp/requirements-dev.txt
 RUN git config --global --add safe.directory /home/pandas
 

asv_bench/benchmarks/algorithms.py

@@ -199,8 +199,8 @@ class SortIntegerArray:
     params = [10**3, 10**5]
 
     def setup(self, N):
-        data = np.arange(N, dtype=float)
-        data[40] = np.nan
+        data = np.arange(N, dtype=float).astype(object)
+        data[40] = pd.NA
         self.array = pd.array(data, dtype="Int64")
 
     def time_argsort(self, N):

asv_bench/benchmarks/frame_methods.py

@@ -4,6 +4,7 @@
 import numpy as np
 
 from pandas import (
+    NA,
     DataFrame,
     Index,
     MultiIndex,
@@ -445,6 +446,8 @@ def setup(self, inplace, dtype):
             values[::2] = np.nan
             if dtype == "Int64":
                 values = values.round()
+                values = values.astype(object)
+                values[::2] = NA
             self.df = DataFrame(values, dtype=dtype)
         self.fill_values = self.df.iloc[self.df.first_valid_index()].to_dict()
 

asv_bench/benchmarks/groupby.py

@@ -689,6 +689,10 @@ def setup(self, dtype, method, with_nans):
             null_vals = vals.astype(float, copy=True)
             null_vals[::2, :] = np.nan
             null_vals[::3, :] = np.nan
+            if dtype in ["Int64", "Float64"]:
+                null_vals = null_vals.astype(object)
+                null_vals[::2, :] = NA
+                null_vals[::3, :] = NA
             df = DataFrame(null_vals, columns=list("abcde"), dtype=dtype)
             df["key"] = keys
             self.df = df

ci/deps/actions-311-minimum_versions.yaml

@@ -13,10 +13,10 @@ dependencies:
   - meson-python=0.13.1
 
   # test dependencies
-  - pytest>=7.3.2
+  - pytest>=8.3.4
   - pytest-cov
-  - pytest-xdist>=3.4.0
-  - pytest-localserver>=0.8.1
+  - pytest-xdist>=3.6.1
+  - pytest-localserver>=0.9.0
   - pytest-qt>=4.4.0
   - boto3=1.37.3
 

ci/deps/actions-311.yaml

@@ -11,10 +11,10 @@ dependencies:
   - meson-python=0.13.1
 
   # test dependencies
-  - pytest>=7.3.2
+  - pytest>=8.3.4
   - pytest-cov
-  - pytest-xdist>=3.4.0
-  - pytest-localserver>=0.8.1
+  - pytest-xdist>=3.6.1
+  - pytest-localserver>=0.9.0
   - pytest-qt>=4.4.0
   - boto3=1.37.3
 

ci/deps/actions-312.yaml

@@ -11,10 +11,10 @@ dependencies:
   - meson-python=0.13.1
 
   # test dependencies
-  - pytest>=7.3.2
+  - pytest>=8.3.4
   - pytest-cov
-  - pytest-xdist>=3.4.0
-  - pytest-localserver>=0.8.1
+  - pytest-xdist>=3.6.1
+  - pytest-localserver>=0.9.0
   - pytest-qt>=4.4.0
   - boto3=1.37.3
 

ci/deps/actions-313-downstream_compat.yaml

@@ -12,10 +12,10 @@ dependencies:
   - meson-python=0.13.1
 
   # test dependencies
-  - pytest>=7.3.2
+  - pytest>=8.3.4
   - pytest-cov
-  - pytest-xdist>=3.4.0
-  - pytest-localserver>=0.8.1
+  - pytest-xdist>=3.6.1
+  - pytest-localserver>=0.9.0
   - pytest-qt>=4.4.0
   - boto3=1.37.3