Merge master to fix CI

[blueyed]

No description provided.

[asottile]

[asottile]

lolrip, rng gave you the creepy cat

[codecov]

Codecov Report

Merging #5263 into features will increase coverage by 0.62%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##           features    #5263      +/-   ##
============================================
+ Coverage      92.1%   92.72%   +0.62%     
============================================
  Files           115      115              
  Lines         26159    26159              
  Branches       2578     2578              
============================================
+ Hits          24093    24256     +163     
+ Misses         1742     1585     -157     
+ Partials        324      318       -6

Impacted Files	Coverage Δ
testing/python/setup_plan.py	20% <0%> (-80%)	⬇️
testing/python/collect.py	74.2% <0%> (-22.82%)	⬇️
testing/python/metafunc.py	86.02% <0%> (-9.2%)	⬇️
src/_pytest/compat.py	95.97% <0%> (-1.01%)	⬇️
src/_pytest/main.py	96.05% <0%> (+0.21%)	⬆️
src/_pytest/nodes.py	95.58% <0%> (+0.49%)	⬆️
src/_pytest/python.py	92.61% <0%> (+0.6%)	⬆️
src/_pytest/runner.py	96.82% <0%> (+0.79%)	⬆️
src/_pytest/unittest.py	94.17% <0%> (+1.05%)	⬆️
src/_pytest/_code/source.py	91.58% <0%> (+1.4%)	⬆️
... and 6 more

---

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 cc464f6...2db05b6. Read the comment docs.