borg icon indicating copy to clipboard operation
borg copied to clipboard

_version.py: remove trailing blank, add LF at EOF

Open ThomasWaldmann opened this issue 3 years ago • 3 comments

@LocutusOfBorg As it was before, it triggered the flake8 pep8-checker, so I fixed that.

Does this still work for the issue you fixed here recently?

ThomasWaldmann avatar Aug 04 '22 08:08 ThomasWaldmann

@LocutusOfBorg I'ld like to release 1.2.2 soon to get some fixes out, esp. the regression seen in 1.2.1.

Not sure whether to merge this PR (and backport it to 1.2) or not...

ThomasWaldmann avatar Aug 06 '22 08:08 ThomasWaldmann

Guess it should work:

https://github.com/pypa/setuptools_scm/commit/b45e19f9f275a31873fd5e07faabef16fd0bbec0#diff-bdefa0298003efada7c465428643cc6d9c129168afb3eb5c551b40fcc77feac1L39

  • i don't see the trailing blank in the removed template lines
  • there is also the LF at the end in the removed template lines

otoh:

  • @LocutusOfBorg's current patch obviously fixed the issue. are whitespace changes ignored somehow?

ThomasWaldmann avatar Aug 06 '22 09:08 ThomasWaldmann

@LocutusOfBorg i already merged this change into master (so it is already in 2.0.0b1 release), but would like to wait for your feedback before merging into 1.2-maint.

ThomasWaldmann avatar Aug 07 '22 20:08 ThomasWaldmann

closing this, accidentally did this against master instead of against 1.2-maint.

ThomasWaldmann avatar Aug 13 '22 18:08 ThomasWaldmann