Mercurial > hg
comparison tests/hghave.py @ 49267:f639982dfd00 stable
hghave: make black version regex work with newer versions of black
Black commit 117891878e5be4d6b771ae5de299e51b679cea27 (included in black >=
21.11b0) dropped the string "version " from the output of "black --version". To
make the regex work with newer black versions, make matching of "version "
optional.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Sun, 22 May 2022 01:48:20 +0200 |
parents | 6cfa30681a1d |
children | 127d33e63d1a |
comparison
equal
deleted
inserted
replaced
49245:13c37f1c7c4b | 49267:f639982dfd00 |
---|---|
1121 | 1121 |
1122 | 1122 |
1123 @check('black', 'the black formatter for python (>= 20.8b1)') | 1123 @check('black', 'the black formatter for python (>= 20.8b1)') |
1124 def has_black(): | 1124 def has_black(): |
1125 blackcmd = 'black --version' | 1125 blackcmd = 'black --version' |
1126 version_regex = b'black, version ([0-9a-b.]+)' | 1126 version_regex = b'black, (?:version )?([0-9a-b.]+)' |
1127 version = matchoutput(blackcmd, version_regex) | 1127 version = matchoutput(blackcmd, version_regex) |
1128 sv = distutils.version.StrictVersion | 1128 sv = distutils.version.StrictVersion |
1129 return version and sv(_bytes2sys(version.group(1))) >= sv('20.8b1') | 1129 return version and sv(_bytes2sys(version.group(1))) >= sv('20.8b1') |
1130 | 1130 |
1131 | 1131 |