7.0: make branch flake8 clean