Add pre commits: flake8 and merge conflicts

This is an improvement on !727 (closed), instead of "doing" everything we can introduce things slowly :)

added 1 commit

• eb19dca1 - Add advice on the pre-commit to the CONTRIBUTING guide

Compare with previous version

added 1 commit

• 5ff75555 - Fix flake8 issues in tests and docs

Compare with previous version

changed milestone to %0.6.8

approved this merge request

added 10 commits

• 5ff75555...dc202662 - 8 commits from branch master
• 5d12925d - Merge branch 'master' into add-pre-commits-slowly
• d6dd904b - Reblack merge

Compare with previous version

approved this merge request

added 17 commits

• d6dd904b...16d28028 - 16 commits from branch master
• 8c3986d0 - Merge branch 'master' into add-pre-commits-slowly

Compare with previous version

approved this merge request

approved this merge request

merged

mentioned in commit bc94d3df