From af8f994b060aae67cc4016292b957ee68a11057e Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:05:01 -0800
Subject: [PATCH 01/26] CI: Add missing pypy specifier to pypy build

---
 ci/deps/actions-pypy-38.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml
index b44cfe5ad5a0d..5a16d4a8a972c 100644
--- a/ci/deps/actions-pypy-38.yaml
+++ b/ci/deps/actions-pypy-38.yaml
@@ -5,7 +5,7 @@ dependencies:
   # TODO: Add the rest of the dependencies in here
   # once the other plentiful failures/segfaults
   # with base pandas has been dealt with
-  - python=3.8
+  - python=3.8[build=*_pypy]
 
   # tools
   - cython>=0.29.24

From daa0add99a150a649066af809e775031313d2ac8 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:07:04 -0800
Subject: [PATCH 02/26] Update posix.yml

---
 .github/workflows/posix.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 53c38b5d47b24..a49d032d5e48f 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -89,6 +89,8 @@ jobs:
 
     - name: Test
       run: ci/run_tests.sh
+      # TODO: Don't continue on error for PyPy
+      continue-on-error: ${{ contains(matrix.settings[0], 'pypy') }}
       if: always()
 
     - name: Build Version

From 665a878630750b7eb852460e8216e5b3f6684472 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:22:06 -0800
Subject: [PATCH 03/26] Update actions-pypy-38.yaml

---
 ci/deps/actions-pypy-38.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml
index 5a16d4a8a972c..70c7f40d7dc5b 100644
--- a/ci/deps/actions-pypy-38.yaml
+++ b/ci/deps/actions-pypy-38.yaml
@@ -5,7 +5,7 @@ dependencies:
   # TODO: Add the rest of the dependencies in here
   # once the other plentiful failures/segfaults
   # with base pandas has been dealt with
-  - python=3.8[build=*_pypy]
+  - pypy3.8
 
   # tools
   - cython>=0.29.24

From 676d9c41ef74d7bb63745447a9efa0a50fafffd9 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:32:06 -0800
Subject: [PATCH 04/26] Update actions-pypy-38.yaml

---
 ci/deps/actions-pypy-38.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml
index 70c7f40d7dc5b..ad05d2ab2dacc 100644
--- a/ci/deps/actions-pypy-38.yaml
+++ b/ci/deps/actions-pypy-38.yaml
@@ -5,7 +5,7 @@ dependencies:
   # TODO: Add the rest of the dependencies in here
   # once the other plentiful failures/segfaults
   # with base pandas has been dealt with
-  - pypy3.8
+  - python=3.8[build=*_pypy] # TODO: use this once pypy3.8 is available
 
   # tools
   - cython>=0.29.24

From d0c12c66a4ac722fe8c087f9577eb5c65ae1b565 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:37:38 -0800
Subject: [PATCH 05/26] don't use conda for pypy support

---
 .github/workflows/posix.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index a49d032d5e48f..ef69ebb033477 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -46,6 +46,7 @@ jobs:
       PANDAS_TESTING_MODE: ${{ matrix.settings[5] }}
       TEST_ARGS: ${{ matrix.settings[6] }}
       PYTEST_TARGET:  pandas
+      IS_PYPY: ${{ contains(matrix.settings[0], 'pypy') }}
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
       group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}
@@ -83,6 +84,18 @@ jobs:
         channel-priority: flexible
         environment-file: ${{ env.ENV_FILE }}
         use-only-tar-bz2: true
+      if: !IS_PYPY # No pypy3.8 support
+    
+    - name: Setup PyPy
+      uses: actions/setup-python@v2.3.1
+      with:
+        python-version: "pypy-3.8"
+      if: IS_PYPY
+    
+    - name: Setup PyPy dependencies
+      run: |
+        pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-cov pytest-xdist>=1.31 hypothesis>=5.5.3
+      if: IS_PYPY    
 
     - name: Build Pandas
       uses: ./.github/actions/build_pandas
@@ -90,7 +103,7 @@ jobs:
     - name: Test
       run: ci/run_tests.sh
       # TODO: Don't continue on error for PyPy
-      continue-on-error: ${{ contains(matrix.settings[0], 'pypy') }}
+      continue-on-error: ${{ IS_PYPY }}
       if: always()
 
     - name: Build Version

From d8516c5b7d516d1e3cb994b654aff987e5bd0bc3 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:41:49 -0800
Subject: [PATCH 06/26] Update posix.yml

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

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index ef69ebb033477..30f64cd9223ce 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -84,7 +84,7 @@ jobs:
         channel-priority: flexible
         environment-file: ${{ env.ENV_FILE }}
         use-only-tar-bz2: true
-      if: !IS_PYPY # No pypy3.8 support
+      if: ${{ !IS_PYPY }} # No pypy3.8 support
     
     - name: Setup PyPy
       uses: actions/setup-python@v2.3.1

From caa47fdcd23105a1d24209dbd56cfb3f646b0507 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:45:49 -0800
Subject: [PATCH 07/26] Update posix.yml

---
 .github/workflows/posix.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 30f64cd9223ce..d5b8a6a345bf6 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -84,18 +84,18 @@ jobs:
         channel-priority: flexible
         environment-file: ${{ env.ENV_FILE }}
         use-only-tar-bz2: true
-      if: ${{ !IS_PYPY }} # No pypy3.8 support
+      if: ${{ !env.IS_PYPY }} # No pypy3.8 support
     
     - name: Setup PyPy
       uses: actions/setup-python@v2.3.1
       with:
         python-version: "pypy-3.8"
-      if: IS_PYPY
+      if: env.IS_PYPY
     
     - name: Setup PyPy dependencies
       run: |
         pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-cov pytest-xdist>=1.31 hypothesis>=5.5.3
-      if: IS_PYPY    
+      if: env.IS_PYPY    
 
     - name: Build Pandas
       uses: ./.github/actions/build_pandas
@@ -103,7 +103,7 @@ jobs:
     - name: Test
       run: ci/run_tests.sh
       # TODO: Don't continue on error for PyPy
-      continue-on-error: ${{ IS_PYPY }}
+      continue-on-error: ${{ env.IS_PYPY }}
       if: always()
 
     - name: Build Version

From c4158de3e286efc8dd77cacf0fd5611e50b2845a Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 17:45:53 -0800
Subject: [PATCH 08/26] Update posix.yml

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

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index d5b8a6a345bf6..83a311ce626c8 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -103,7 +103,7 @@ jobs:
     - name: Test
       run: ci/run_tests.sh
       # TODO: Don't continue on error for PyPy
-      continue-on-error: ${{ env.IS_PYPY }}
+      continue-on-error: ${{ env.IS_PYPY == 'true'}}
       if: always()
 
     - name: Build Version

From 8cb21eb229e7a7777ede29793d93891b90af2ed7 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 18:22:30 -0800
Subject: [PATCH 09/26] try something

---
 .github/workflows/posix.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 83a311ce626c8..4c1ca2bb393a1 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -90,12 +90,12 @@ jobs:
       uses: actions/setup-python@v2.3.1
       with:
         python-version: "pypy-3.8"
-      if: env.IS_PYPY
+      if: ${{ env.IS_PYPY }}
     
     - name: Setup PyPy dependencies
       run: |
         pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-cov pytest-xdist>=1.31 hypothesis>=5.5.3
-      if: env.IS_PYPY    
+      if: ${{ env.IS_PYPY }}    
 
     - name: Build Pandas
       uses: ./.github/actions/build_pandas

From 649b0ae12f31ea688938fcc9d7e29146bc076de0 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 18:26:29 -0800
Subject: [PATCH 10/26] Update posix.yml

---
 .github/workflows/posix.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 4c1ca2bb393a1..568e09d1464fb 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -84,18 +84,18 @@ jobs:
         channel-priority: flexible
         environment-file: ${{ env.ENV_FILE }}
         use-only-tar-bz2: true
-      if: ${{ !env.IS_PYPY }} # No pypy3.8 support
+      if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support
     
     - name: Setup PyPy
       uses: actions/setup-python@v2.3.1
       with:
         python-version: "pypy-3.8"
-      if: ${{ env.IS_PYPY }}
+      if: ${{ env.IS_PYPY == 'true' }}
     
     - name: Setup PyPy dependencies
       run: |
         pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-cov pytest-xdist>=1.31 hypothesis>=5.5.3
-      if: ${{ env.IS_PYPY }}    
+      if: ${{ env.IS_PYPY == 'true' }}    
 
     - name: Build Pandas
       uses: ./.github/actions/build_pandas
@@ -103,7 +103,7 @@ jobs:
     - name: Test
       run: ci/run_tests.sh
       # TODO: Don't continue on error for PyPy
-      continue-on-error: ${{ env.IS_PYPY == 'true'}}
+      continue-on-error: ${{ env.IS_PYPY == 'true' }}
       if: always()
 
     - name: Build Version

From e3eeb30b566475eaa0ffa6d39bed4ec3a3fee7c4 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 20:30:16 -0800
Subject: [PATCH 11/26] Update posix.yml

---
 .github/workflows/posix.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 568e09d1464fb..b8394132c2171 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -94,7 +94,8 @@ jobs:
     
     - name: Setup PyPy dependencies
       run: |
-        pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-cov pytest-xdist>=1.31 hypothesis>=5.5.3
+        # TODO: re-enable cov, its slowing the tests down though
+        pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3
       if: ${{ env.IS_PYPY == 'true' }}    
 
     - name: Build Pandas

From 68595e6b1fd78d8f53a2cd5240cfd37e6c785594 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 07:27:01 -0800
Subject: [PATCH 12/26] Update posix.yml

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

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index b8394132c2171..406fc92918539 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -37,7 +37,6 @@ jobs:
         ]
       fail-fast: false
     env:
-      COVERAGE: true
       ENV_FILE: ci/deps/${{ matrix.settings[0] }}
       PATTERN: ${{ matrix.settings[1] }}
       EXTRA_APT: ${{ matrix.settings[2] }}
@@ -47,6 +46,7 @@ jobs:
       TEST_ARGS: ${{ matrix.settings[6] }}
       PYTEST_TARGET:  pandas
       IS_PYPY: ${{ contains(matrix.settings[0], 'pypy') }}
+      COVERAGE: ${{ IS_PYPY == 'false' }}
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
       group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}

From 7a8ff937637931880cbbd6938f8292593b0e3021 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 07:40:50 -0800
Subject: [PATCH 13/26] Update posix.yml

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

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 406fc92918539..77a8e05763f2d 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -46,7 +46,7 @@ jobs:
       TEST_ARGS: ${{ matrix.settings[6] }}
       PYTEST_TARGET:  pandas
       IS_PYPY: ${{ contains(matrix.settings[0], 'pypy') }}
-      COVERAGE: ${{ IS_PYPY == 'false' }}
+      COVERAGE: ${{ env.IS_PYPY == 'false' }}
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
       group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}

From ff889b3df40f619fc81922a565b612942264f129 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 07:43:56 -0800
Subject: [PATCH 14/26] Update posix.yml

---
 .github/workflows/posix.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 77a8e05763f2d..f343b6c83e14c 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -46,7 +46,8 @@ jobs:
       TEST_ARGS: ${{ matrix.settings[6] }}
       PYTEST_TARGET:  pandas
       IS_PYPY: ${{ contains(matrix.settings[0], 'pypy') }}
-      COVERAGE: ${{ env.IS_PYPY == 'false' }}
+      # TODO: re-enable coverage on pypy, its slow
+      COVERAGE: ${{ contains(matrix.settings[0], 'pypy') }}
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
       group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}

From 426451cb9834f9670756f017fef6ad1a979b1bb5 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 14:04:46 -0800
Subject: [PATCH 15/26] Update posix.yml

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

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index f343b6c83e14c..4d20eb6493238 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -47,7 +47,7 @@ jobs:
       PYTEST_TARGET:  pandas
       IS_PYPY: ${{ contains(matrix.settings[0], 'pypy') }}
       # TODO: re-enable coverage on pypy, its slow
-      COVERAGE: ${{ contains(matrix.settings[0], 'pypy') }}
+      COVERAGE: ${{ !contains(matrix.settings[0], 'pypy') }}
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
       group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}

From d299b8747c06b9f775fac7b2f778dfe26af6c8f0 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 16:10:47 -0800
Subject: [PATCH 16/26] bug in runtests?

---
 ci/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 9fea696b6ea81..a852bdf18fce6 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -9,7 +9,7 @@ if [[ "not network" == *"$PATTERN"* ]]; then
     export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
 fi
 
-if [ "$COVERAGE" ]; then
+if $COVERAGE; then
     COVERAGE="-s --cov=pandas --cov-report=xml --cov-append"
 fi
 

From a86405080ba26e45e70c901ae479d7d89f540451 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 16:24:48 -0800
Subject: [PATCH 17/26] Update run_tests.sh

---
 ci/run_tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index a852bdf18fce6..87ff1829eb47d 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -11,6 +11,8 @@ fi
 
 if $COVERAGE; then
     COVERAGE="-s --cov=pandas --cov-report=xml --cov-append"
+else
+    COVERAGE=""
 fi
 
 # If no X server is found, we use xvfb to emulate it

From dd555ae865f2b2986f3ef8a684f0c99dc1fbe162 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 17:28:19 -0800
Subject: [PATCH 18/26] Update run_tests.sh

---
 ci/run_tests.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 87ff1829eb47d..2347a6158ec83 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -9,10 +9,8 @@ if [[ "not network" == *"$PATTERN"* ]]; then
     export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
 fi
 
-if $COVERAGE; then
+if [[ "$COVERAGE" == "true" ]]; then
     COVERAGE="-s --cov=pandas --cov-report=xml --cov-append"
-else
-    COVERAGE=""
 fi
 
 # If no X server is found, we use xvfb to emulate it

From 8f21422f4d60417b34ce6e6d6038553bc1bdc918 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 18:36:34 -0800
Subject: [PATCH 19/26] pre-commit

---
 .github/workflows/posix.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 4d20eb6493238..f5b35f4d07ef8 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -86,18 +86,18 @@ jobs:
         environment-file: ${{ env.ENV_FILE }}
         use-only-tar-bz2: true
       if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support
-    
+
     - name: Setup PyPy
       uses: actions/setup-python@v2.3.1
       with:
         python-version: "pypy-3.8"
       if: ${{ env.IS_PYPY == 'true' }}
-    
+
     - name: Setup PyPy dependencies
       run: |
         # TODO: re-enable cov, its slowing the tests down though
         pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3
-      if: ${{ env.IS_PYPY == 'true' }}    
+      if: ${{ env.IS_PYPY == 'true' }}
 
     - name: Build Pandas
       uses: ./.github/actions/build_pandas

From 778b9e08557ecb45794180cb717bb7efbcabda1c Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 15 Dec 2021 18:53:39 -0800
Subject: [PATCH 20/26] Update run_tests.sh

---
 ci/run_tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 2347a6158ec83..fd7e20d57c6da 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -11,6 +11,8 @@ fi
 
 if [[ "$COVERAGE" == "true" ]]; then
     COVERAGE="-s --cov=pandas --cov-report=xml --cov-append"
+else
+    COVERAGE="" # We need to reset this for COVERAGE="false" case
 fi
 
 # If no X server is found, we use xvfb to emulate it

From 672486f906cf8fbb60cd91b5176e2e95ca5dce0c Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 16 Dec 2021 16:16:22 -0800
Subject: [PATCH 21/26] more verbosity

---
 .github/workflows/posix.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index f5b35f4d07ef8..d05dd925e9845 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -94,6 +94,7 @@ jobs:
       if: ${{ env.IS_PYPY == 'true' }}
 
     - name: Setup PyPy dependencies
+      shell: bash
       run: |
         # TODO: re-enable cov, its slowing the tests down though
         pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3

From c7adffb12ac1f75a093b4173059ba69ae1a8748f Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 16 Dec 2021 17:18:24 -0800
Subject: [PATCH 22/26] Update posix.yml

---
 .github/workflows/posix.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index d05dd925e9845..c81e3fa28c743 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -97,7 +97,8 @@ jobs:
       shell: bash
       run: |
         # TODO: re-enable cov, its slowing the tests down though
-        pip install cython>=0.29.24 numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3
+        # TODO: Unpin Cython, the new Cython 0.29.26 is causing compilation errors
+        pip install "Cython>=0.29.24<0.29.26" numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3
       if: ${{ env.IS_PYPY == 'true' }}
 
     - name: Build Pandas

From fc0b8bba71a885435f6ae1f27567e59ded5e41f1 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 16 Dec 2021 18:54:29 -0800
Subject: [PATCH 23/26] Update posix.yml

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

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index c81e3fa28c743..84db3ffe74178 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -98,7 +98,7 @@ jobs:
       run: |
         # TODO: re-enable cov, its slowing the tests down though
         # TODO: Unpin Cython, the new Cython 0.29.26 is causing compilation errors
-        pip install "Cython>=0.29.24<0.29.26" numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3
+        pip install Cython==0.29.25 numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3
       if: ${{ env.IS_PYPY == 'true' }}
 
     - name: Build Pandas

From 177d67e3e3b57712536f58846329b915fcd17e50 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Fri, 17 Dec 2021 07:27:12 -0800
Subject: [PATCH 24/26] disable pytest-xdist

---
 .github/workflows/posix.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index 84db3ffe74178..dc8c37eaeb9a5 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -98,7 +98,8 @@ jobs:
       run: |
         # TODO: re-enable cov, its slowing the tests down though
         # TODO: Unpin Cython, the new Cython 0.29.26 is causing compilation errors
-        pip install Cython==0.29.25 numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31 hypothesis>=5.5.3
+        # TODO: re-enable pytest-xdist once tests do not crash PyPy
+        pip install Cython==0.29.25 numpy python-dateutil pytz pytest>=6.0 hypothesis>=5.5.3
       if: ${{ env.IS_PYPY == 'true' }}
 
     - name: Build Pandas

From 7698dda05151d94371fcc2229a26014bb15fa7aa Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Fri, 17 Dec 2021 07:52:11 -0800
Subject: [PATCH 25/26] bring back pytest-xdist, don't restart workers

---
 .github/workflows/posix.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index dc8c37eaeb9a5..a51d84ba587d9 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -15,6 +15,8 @@ on:
 env:
   PYTEST_WORKERS: "auto"
   PANDAS_CI: 1
+  # Don't restart crashed workers, b/c it might hang the tests for PyPy
+  TEST_ARGS: "--max-worker-restart 0"
 
 jobs:
   pytest:
@@ -98,8 +100,7 @@ jobs:
       run: |
         # TODO: re-enable cov, its slowing the tests down though
         # TODO: Unpin Cython, the new Cython 0.29.26 is causing compilation errors
-        # TODO: re-enable pytest-xdist once tests do not crash PyPy
-        pip install Cython==0.29.25 numpy python-dateutil pytz pytest>=6.0 hypothesis>=5.5.3
+        pip install Cython==0.29.25 numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31.0 hypothesis>=5.5.3
       if: ${{ env.IS_PYPY == 'true' }}
 
     - name: Build Pandas

From 50d1a51638d0c96ab72837477364437e35a6c5ae Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Fri, 17 Dec 2021 08:06:50 -0800
Subject: [PATCH 26/26] specify test args correctly

---
 .github/workflows/posix.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
index a51d84ba587d9..9839eacc046f9 100644
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -15,8 +15,6 @@ on:
 env:
   PYTEST_WORKERS: "auto"
   PANDAS_CI: 1
-  # Don't restart crashed workers, b/c it might hang the tests for PyPy
-  TEST_ARGS: "--max-worker-restart 0"
 
 jobs:
   pytest:
@@ -33,7 +31,7 @@ jobs:
           [actions-38-slow.yaml, "slow", "", "", "", "", ""],
           [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
           [actions-39-slow.yaml, "slow", "", "", "", "", ""],
-          [actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", ""],
+          [actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", "--max-worker-restart 0"],
           [actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
           [actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""]
         ]