Backport PR #32025 and #32031 silence numpy-dev failures#32057

TomAugspurger merged 3 commits intopandas-dev:1.0.xpandas-dev/pandas:1.0.xfrom

simonjayhawkins:np-devsimonjayhawkins/pandas:np-devCopy head branch name to clipboard