From 84bd82f63255f95613e4ef526f20585b6a340738 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 30 May 2022 14:47:49 -0700
Subject: [PATCH 1/2] CI: Versioneer not picking up version in 32-bit build

---
 .github/workflows/32-bit-linux.yml      | 6 ++++++
 pandas/tests/test_common.py             | 8 --------
 pandas/tests/util/test_show_versions.py | 7 -------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/32-bit-linux.yml b/.github/workflows/32-bit-linux.yml
index 500e800a082d9..43759e727eb43 100644
--- a/.github/workflows/32-bit-linux.yml
+++ b/.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' && \
diff --git a/pandas/tests/test_common.py b/pandas/tests/test_common.py
index 71e95555a6f83..d31f617b9be15 100644
--- a/pandas/tests/test_common.py
+++ b/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__
diff --git a/pandas/tests/util/test_show_versions.py b/pandas/tests/util/test_show_versions.py
index f7291a292324e..99c7e0a1a8956 100644
--- a/pandas/tests/util/test_show_versions.py
+++ b/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

From 1f8fdf4f30536c79feda260bea4ae8a05276d9d6 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 31 May 2022 11:54:25 -0700
Subject: [PATCH 2/2] code checks

---
 .github/workflows/32-bit-linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/32-bit-linux.yml b/.github/workflows/32-bit-linux.yml
index 43759e727eb43..be894e6a5a63e 100644
--- a/.github/workflows/32-bit-linux.yml
+++ b/.github/workflows/32-bit-linux.yml
@@ -26,7 +26,7 @@ jobs:
           # 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. 
+          # 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 \