v3006.21
Pyupgrade and drop six
Update to isort 5.10.1
Update code to be Py3.7+ to reduce merge forward conflicts