master
Drop Py2 and six on tests/integration/shell/__init__.py
Update to isort 5.10.1
Update pre-commit hook versions
Update code to be Py3.7+ to reduce merge forward conflicts