Merge branch 'main' into patch-2

Author: jonashaag

.github/workflows/32-bit-linux.yml

@@ -23,9 +23,15 @@ jobs:
 
       - name: Run 32-bit manylinux2014 Docker Build / Tests
         run: |
+          # Without this (line 34), versioneer will not be able to determine the pandas version.
+          # This is because of a security update to git that blocks it from reading the config folder if
+          # it is not owned by the current user. We hit this since the "mounted" folder is not hit by the
+          # Docker container.
+          # xref https://github.com/pypa/manylinux/issues/1309
           docker pull quay.io/pypa/manylinux2014_i686
           docker run --platform linux/386 -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \
           /bin/bash -xc "cd pandas && \
+          git config --global --add safe.directory /pandas && \
           /opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
           . ~/virtualenvs/pandas-dev/bin/activate && \
           python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     -   id: absolufy-imports
         files: ^pandas/
 -   repo: https://github.com/jendrikseipp/vulture
-    rev: 'v2.3'
+    rev: 'v2.4'
     hooks:
       - id: vulture
         entry: python scripts/run_vulture.py
@@ -60,7 +60,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v2.32.1
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
@@ -75,7 +75,7 @@ repos:
         types: [text]  # overwrite types: [rst]
         types_or: [python, rst]
 -   repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: v0.4.1
+    rev: v0.6
     hooks:
     - id: sphinx-lint
 -   repo: https://github.com/asottile/yesqa

pandas/core/computation/align.py

@@ -9,6 +9,7 @@
 )
 from typing import (
     TYPE_CHECKING,
+    Callable,
     Sequence,
 )
 import warnings
@@ -28,6 +29,8 @@
 from pandas.core.computation.common import result_type_many
 
 if TYPE_CHECKING:
+    from pandas._typing import F
+
     from pandas.core.generic import NDFrame
     from pandas.core.indexes.api import Index
 
@@ -62,7 +65,7 @@ def _any_pandas_objects(terms) -> bool:
     return any(isinstance(term.value, PandasObject) for term in terms)
 
 
-def _filter_special_cases(f):
+def _filter_special_cases(f) -> Callable[[F], F]:
     @wraps(f)
     def wrapper(terms):
         # single unary operand

pandas/core/reshape/merge.py

@@ -162,7 +162,9 @@ def _groupby_and_merge(by, left: DataFrame, right: DataFrame, merge_pieces):
                 lcols = lhs.columns.tolist()
                 cols = lcols + [r for r in right.columns if r not in set(lcols)]
                 merged = lhs.reindex(columns=cols)
-                merged.index = range(len(merged))
+                # error: Incompatible types in assignment (expression has type
+                # "range", variable has type "Index")
+                merged.index = range(len(merged))  # type: ignore[assignment]
                 pieces.append(merged)
                 continue
 

pandas/tests/test_common.py

@@ -5,11 +5,6 @@
 import numpy as np
 import pytest
 
-from pandas.compat import (
-    IS64,
-    is_ci_environment,
-)
-
 import pandas as pd
 from pandas import Series
 import pandas._testing as tm
@@ -162,9 +157,6 @@ def test_standardize_mapping():
     assert isinstance(com.standardize_mapping(dd), partial)
 
 
-@pytest.mark.xfail(
-    is_ci_environment() and not IS64, reason="Failing on 32 bit Python CI job"
-)
 def test_git_version():
     # GH 21295
     git_version = pd.__git_version__

pandas/tests/util/test_show_versions.py

@@ -4,10 +4,6 @@
 
 import pytest
 
-from pandas.compat import (
-    IS64,
-    is_ci_environment,
-)
 from pandas.util._print_versions import (
     _get_dependency_info,
     _get_sys_info,
@@ -73,9 +69,6 @@ def test_show_versions_console_json(capsys):
     assert result == expected
 
 
-@pytest.mark.xfail(
-    is_ci_environment() and not IS64, reason="Failing on 32 bit Python CI job"
-)
 def test_show_versions_console(capsys):
     # gh-32041
     # gh-32041

pandas/util/_decorators.py

@@ -323,7 +323,7 @@ def wrapper(*args, **kwargs):
 
 def rewrite_axis_style_signature(
     name: str, extra_params: list[tuple[str, Any]]
-) -> Callable[..., Any]:
+) -> Callable[[F], F]:
     def decorate(func: F) -> F:
         @wraps(func)
         def wrapper(*args, **kwargs) -> Callable[..., Any]: