Backport PR #25323 on branch 0.24.x (Skipped broken Py2 / Windows test)

[meeseeksmachine]

Backport PR #25323: Skipped broken Py2 / Windows test

[codecov]

Codecov Report

Merging #25325 into 0.24.x will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           0.24.x   #25325   +/-   ##
=======================================
  Coverage   92.38%   92.38%           
=======================================
  Files         166      166           
  Lines       52405    52405           
=======================================
  Hits        48413    48413           
  Misses       3992     3992

Flag	Coverage Δ
#multiple	90.8% <ø> (ø)	⬆️
#single	42.87% <ø> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e06ec77...bad866d. Read the comment docs.

[codecov]

Codecov Report

Merging #25325 into 0.24.x will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           0.24.x   #25325   +/-   ##
=======================================
  Coverage   92.38%   92.38%           
=======================================
  Files         166      166           
  Lines       52405    52405           
=======================================
  Hits        48413    48413           
  Misses       3992     3992

Flag	Coverage Δ
#multiple	90.8% <ø> (ø)	⬆️
#single	42.87% <ø> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e06ec77...bad866d. Read the comment docs.

[WillAyd]

@jreback not entirely familiar with the process here - do I merge this as well?

[gfyoung]

@WillAyd : These are relatively straightforward to merge because we've already vetted and tested on the master branch, so once they're green, you should be able to merge.