v3006.24
Fix: code quality issues (#59385)
Update code to be Py3.7+ to reduce merge forward conflicts
Update to latest ``pyupgrade`` hook. Stop skipping it on CI.