v3006.18
Pyupgrade and drop six
Update pre-commit hook versions
Update code to be Py3.7+ to reduce merge forward conflicts