v3006.22
Update code to be Py3.7+ to reduce merge forward conflicts
Update scripts/* to explicitly reference Python 3
fix pre
Pyupgrade and drop six