search

Psycojoker / prosopopee

a static website generator to make beautiful customizable pictures galleries that tell a story
http://prosopopee.readthedocs.org
GNU General Public License v3.0
327 stars 56 forks source link

Make tox print the diff when black failed #134

Closed QSchulz closed 3 years ago

QSchulz commented 3 years ago

Running black --check only is not giving the changes to do. black --diff gives this but it does not fail when changes are required.

black --diff --check brings the best of both worlds.

Adding one small commit to patch my nick :)

Psycojoker commented 3 years ago

I've merged this PR by hand because git was being weird again

Thx for this <3

Note that if you want to handle black just do a tox -e black-run, you aren't really expecting to fix this by hand '^'

QSchulz commented 3 years ago

It's been a few times already that something in my PRs made you merge them by hand. Would it be possible to send the conflict as reported by git next time so we can investigate what's going on? Among the PRs you merged before mine, nothing changed in the git context AFAICT, so I'm surprised there was an issue merging it and now I'm being curious :)

Psycojoker commented 3 years ago

I'm pretty sure it's because you base yourself on your master branch and that I have desync the one of this repository because of some forced pushed needed for various reasons :/

(I've release a 1.1.5 btw, I'm not very good at annoucements)