File tree 2 files changed +10
-8
lines changed
2 files changed +10
-8
lines changed Original file line number Diff line number Diff line change 21
21
from tempfile import NamedTemporaryFile
22
22
from time import sleep
23
23
24
+ from packaging .version import InvalidVersion
24
25
from packaging .version import parse
25
26
from packaging .version import Version
26
27
from PIL import Image
@@ -387,13 +388,14 @@ def get_tesseract_version():
387
388
raise TesseractNotFoundError ()
388
389
389
390
raw_version = output .decode (DEFAULT_ENCODING )
390
- strip_version = raw_version .lstrip (string .printable [10 :])
391
+ str_version , * _ = raw_version .lstrip (string .printable [10 :]).partition (' ' )
392
+ str_version , * _ = str_version .partition ('-' )
391
393
392
394
try :
393
- version = parse (strip_version )
394
- assert version > TESSERACT_MIN_VERSION
395
- except AttributeError :
396
- raise SystemExit (f'Invalid tesseract version: "{ strip_version } "' )
395
+ version = parse (str_version )
396
+ assert version >= TESSERACT_MIN_VERSION
397
+ except ( AssertionError , InvalidVersion ) :
398
+ raise SystemExit (f'Invalid tesseract version: "{ raw_version } "' )
397
399
398
400
return version
399
401
Original file line number Diff line number Diff line change @@ -448,14 +448,14 @@ def test_file_to_dict(input_args, expected):
448
448
('tesseract_version' , 'expected' ),
449
449
(
450
450
(b'3.5.0' , '3.5.0' ),
451
- (b'4.1-a8s6f8d3f' , '4.1-a8s6f8d3f ' ),
452
- (b'v4.0.0-beta1.9' , '4.0.0-beta1.9 ' ),
451
+ (b'4.1-a8s6f8d3f' , '4.1' ),
452
+ (b'v4.0.0-beta1.9' , '4.0.0' ),
453
453
),
454
454
)
455
455
def test_get_tesseract_version (tesseract_version , expected ):
456
456
with mock .patch ('subprocess.check_output' , spec = True ) as output_mock :
457
457
output_mock .return_value = tesseract_version
458
- assert get_tesseract_version .__wrapped__ () == expected
458
+ assert get_tesseract_version .__wrapped__ (). public == expected
459
459
460
460
461
461
@pytest .mark .parametrize (
You can’t perform that action at this time.
0 commit comments