Add flake8 to setup.cfg and add missed change to #2303 fix