From b5d0048e3682840be196ad2846a3b0fcdd22101c Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 14:21:47 -0700
Subject: [PATCH 01/15] CI: Test Python 3.10 on MacOS and Windows too

---
 .github/workflows/python-dev.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 596c3b6df9d49..605130c8391df 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -21,7 +21,12 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+
     name: actions-310-dev
     timeout-minutes: 60
 

From c6522f5f12d0a2e964d6b3bd2d5cbd75cd00b081 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 14:29:37 -0700
Subject: [PATCH 02/15] Update python-dev.yml

---
 .github/workflows/python-dev.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 605130c8391df..e91696827ac54 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -26,9 +26,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-
+    
     name: actions-310-dev
     timeout-minutes: 60
+    
+    environment:
+      NUMPY_WHEELS_AVAILABLE: ${{ matrix.os == "ubuntu-latest" }}
 
     concurrency:
       group: ${{ github.ref }}-dev

From 62858b09fae8826c12ba0f7e26a05058449c8a98 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 14:36:58 -0700
Subject: [PATCH 03/15] Update python-dev.yml

---
 .github/workflows/python-dev.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index e91696827ac54..7a9b448bd3c5c 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -30,7 +30,7 @@ jobs:
     name: actions-310-dev
     timeout-minutes: 60
     
-    environment:
+    env:
       NUMPY_WHEELS_AVAILABLE: ${{ matrix.os == "ubuntu-latest" }}
 
     concurrency:
@@ -50,10 +50,12 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
-        pip install git+https://github.com/pytest-dev/pytest.git
+        if [[ $NUMPY_WHEELS_AVAILABLE ==  true]]; then 
+          pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
+        else
+          pip install git+https://github.com/numpy/numpy.git
         pip install git+https://github.com/nedbat/coveragepy.git
-        pip install cython python-dateutil pytz hypothesis pytest-xdist pytest-cov
+        pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov
         pip list
 
     - name: Build Pandas

From aaed72c72e06253e79a22ec98cf2f465b61a75b9 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 14:39:02 -0700
Subject: [PATCH 04/15] Update python-dev.yml

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

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 7a9b448bd3c5c..1207378a9c5f4 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -31,7 +31,7 @@ jobs:
     timeout-minutes: 60
     
     env:
-      NUMPY_WHEELS_AVAILABLE: ${{ matrix.os == "ubuntu-latest" }}
+      NUMPY_WHEELS_AVAILABLE: ${{ matrix.os == 'ubuntu-latest' }}
 
     concurrency:
       group: ${{ github.ref }}-dev

From f76fbc8657129f309d2294b4a3606ae1f0aeda43 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 14:54:15 -0700
Subject: [PATCH 05/15] Update python-dev.yml

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

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 1207378a9c5f4..2ab9fd3cc85df 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -34,7 +34,7 @@ jobs:
       NUMPY_WHEELS_AVAILABLE: ${{ matrix.os == 'ubuntu-latest' }}
 
     concurrency:
-      group: ${{ github.ref }}-dev
+      group: ${{ github.ref }}-${{ matrix.os }}-dev
       cancel-in-progress: ${{github.event_name == 'pull_request'}}
 
     steps:
@@ -48,6 +48,7 @@ jobs:
         python-version: '3.10-dev'
 
     - name: Install dependencies
+      shell: bash
       run: |
         python -m pip install --upgrade pip setuptools wheel
         if [[ $NUMPY_WHEELS_AVAILABLE ==  true]]; then 

From 71a73012fbdc4ba33e907a5a7534f8342ebda63e Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 14:57:42 -0700
Subject: [PATCH 06/15] Update python-dev.yml

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

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 2ab9fd3cc85df..f6e55674bfb53 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -51,7 +51,7 @@ jobs:
       shell: bash
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        if [[ $NUMPY_WHEELS_AVAILABLE ==  true]]; then 
+        if [[ "$NUMPY_WHEELS_AVAILABLE" ]]; then 
           pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
         else
           pip install git+https://github.com/numpy/numpy.git

From c8fb7b629889ac0f4976976d00656816043e8804 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 15:21:57 -0700
Subject: [PATCH 07/15] Update python-dev.yml

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

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index f6e55674bfb53..77b68ab594396 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -55,6 +55,7 @@ jobs:
           pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
         else
           pip install git+https://github.com/numpy/numpy.git
+        fi
         pip install git+https://github.com/nedbat/coveragepy.git
         pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov
         pip list

From f3ce88d6b54ff01ba95937b6c6f6bf43525cf842 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 15:27:37 -0700
Subject: [PATCH 08/15] Update python-dev.yml

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

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 77b68ab594396..bbca854d36150 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -51,7 +51,8 @@ jobs:
       shell: bash
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        if [[ "$NUMPY_WHEELS_AVAILABLE" ]]; then 
+        echo $NUMPY_WHEELS_AVAILABLE
+        if [[ "$NUMPY_WHEELS_AVAILABLE" == "true" ]]; then
           pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
         else
           pip install git+https://github.com/numpy/numpy.git

From 1295448fed4ed781c405c84e3aed052261ff66ad Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 16:20:58 -0700
Subject: [PATCH 09/15] Update python-dev.yml

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

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index bbca854d36150..9424fa27a8995 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -71,6 +71,7 @@ jobs:
         python -c "import pandas; pandas.show_versions();"
 
     - name: Test with pytest
+      shell: bash
       run: |
         ci/run_tests.sh
       # GH 41935

From b6aca54969aa669a64091ef55710ff06f883457a Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 20:51:41 -0700
Subject: [PATCH 10/15] Update test_reductions.py

---
 pandas/tests/frame/test_reductions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/tests/frame/test_reductions.py b/pandas/tests/frame/test_reductions.py
index 886cdfb7d76b0..2ac74199e245a 100644
--- a/pandas/tests/frame/test_reductions.py
+++ b/pandas/tests/frame/test_reductions.py
@@ -1367,7 +1367,7 @@ def test_min_max_dt64_with_NaT_skipna_false(self, request, tz_naive_fixture):
         tz = tz_naive_fixture
         if isinstance(tz, tzlocal) and is_platform_windows():
             request.node.add_marker(
-                pytest.mark.xfail(
+                pytest.mark.skip(
                     reason="GH#37659 OSError raised within tzlocal bc Windows "
                     "chokes in times before 1970-01-01"
                 )

From dd9fc38bf4b39dc37a5ed3c22c6bf807942a2fcb Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 20:59:03 -0700
Subject: [PATCH 11/15] Update python-dev.yml

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

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 9424fa27a8995..2ea032a8cb3ab 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -26,10 +26,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-    
+
     name: actions-310-dev
     timeout-minutes: 60
-    
+
     env:
       NUMPY_WHEELS_AVAILABLE: ${{ matrix.os == 'ubuntu-latest' }}
 

From 756453c9851b4e7f50a2d74f52b9ed634d88d47e Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 07:02:39 -0700
Subject: [PATCH 12/15] Update test_reductions.py

---
 pandas/tests/frame/test_reductions.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pandas/tests/frame/test_reductions.py b/pandas/tests/frame/test_reductions.py
index 2ac74199e245a..b2ab0c023bffe 100644
--- a/pandas/tests/frame/test_reductions.py
+++ b/pandas/tests/frame/test_reductions.py
@@ -1366,11 +1366,9 @@ def test_min_max_dt64_with_NaT_skipna_false(self, request, tz_naive_fixture):
         # GH#36907
         tz = tz_naive_fixture
         if isinstance(tz, tzlocal) and is_platform_windows():
-            request.node.add_marker(
-                pytest.mark.skip(
-                    reason="GH#37659 OSError raised within tzlocal bc Windows "
-                    "chokes in times before 1970-01-01"
-                )
+            pytest.mark.skip(
+                reason="GH#37659 OSError raised within tzlocal bc Windows "
+                "chokes in times before 1970-01-01"
             )
 
         df = DataFrame(

From 614dc7b59c3a9c2816f760f7586ea11ecb136b0e Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 08:13:35 -0700
Subject: [PATCH 13/15] Update test_reductions.py

---
 pandas/tests/frame/test_reductions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/tests/frame/test_reductions.py b/pandas/tests/frame/test_reductions.py
index b2ab0c023bffe..3e8c8f247efb0 100644
--- a/pandas/tests/frame/test_reductions.py
+++ b/pandas/tests/frame/test_reductions.py
@@ -1366,7 +1366,7 @@ def test_min_max_dt64_with_NaT_skipna_false(self, request, tz_naive_fixture):
         # GH#36907
         tz = tz_naive_fixture
         if isinstance(tz, tzlocal) and is_platform_windows():
-            pytest.mark.skip(
+            pytest.skip(
                 reason="GH#37659 OSError raised within tzlocal bc Windows "
                 "chokes in times before 1970-01-01"
             )

From 342c5888374d5c37c1604a5fdaf54e6749032fa4 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 15:46:00 -0700
Subject: [PATCH 14/15] Update test_reductions.py

---
 pandas/tests/frame/test_reductions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/tests/frame/test_reductions.py b/pandas/tests/frame/test_reductions.py
index 3e8c8f247efb0..258e4e6eb0cc9 100644
--- a/pandas/tests/frame/test_reductions.py
+++ b/pandas/tests/frame/test_reductions.py
@@ -1367,7 +1367,7 @@ def test_min_max_dt64_with_NaT_skipna_false(self, request, tz_naive_fixture):
         tz = tz_naive_fixture
         if isinstance(tz, tzlocal) and is_platform_windows():
             pytest.skip(
-                reason="GH#37659 OSError raised within tzlocal bc Windows "
+                "GH#37659 OSError raised within tzlocal bc Windows "
                 "chokes in times before 1970-01-01"
             )
 

From bdac031cac70d92561d929fa5d4fce45ab87cfdf Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 20:28:31 -0700
Subject: [PATCH 15/15] remove debug statement

---
 .github/workflows/python-dev.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 2ea032a8cb3ab..3a139936fbd22 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -51,7 +51,6 @@ jobs:
       shell: bash
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        echo $NUMPY_WHEELS_AVAILABLE
         if [[ "$NUMPY_WHEELS_AVAILABLE" == "true" ]]; then
           pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
         else