Fix another species of Tesseract version number breaking regex

Fixes #795
This commit is contained in:
James R. Barlow
2021-06-16 00:09:03 -07:00
parent 5d08303805
commit 5f01c5e330
2 changed files with 9 additions and 1 deletions
+2 -1
View File
@@ -56,11 +56,12 @@ class TesseractLoggerAdapter(logging.LoggerAdapter):
class TesseractVersion(StrictVersion):
version_re = re.compile(
r'''
^(\d+) \. (\d+) (\. (\d+))? # groups: 1/major, 2/minor, 3/[skip], 4/patch
[-]? # optional hyphen separator
(?:(alpha|beta|rc|dev)[.\-\ ]?(\d+)?)? # 5/prerelease, 6/prerelease_num
(?:(alpha|beta|rc|dev)?[.\-\ ]?(\d+)?)? # 5/prerelease, 6/prerelease_num
(?:-(\d+)-g[0-9a-f]+)? # untagged git version
$
''',
+7
View File
@@ -237,6 +237,13 @@ def test_version_comparison():
need_version='4.0.0',
version_parser=TesseractVersion,
)
vd.check_external_program(
program="tesseract",
package="tesseract",
version_checker=lambda: 'v4.0.0.20181030', # Some Windows builds use this format
need_version='4.0.0',
version_parser=TesseractVersion,
)
vd.check_external_program(
program="tesseract",
package="tesseract",