@@ -276,11 +276,11 @@ def get_base_class_and_magic_number(
276
276
if sys .byteorder == "little" :
277
277
BaseClass = ctypes .BigEndianStructure
278
278
else :
279
- BaseClass = ctypes .LittleEndianStructure
279
+ BaseClass = ctypes .LittleEndianStructure # type: ignore[assignment]
280
280
281
281
magic_number = swap32 (magic_number )
282
282
else :
283
- BaseClass = ctypes .Structure
283
+ BaseClass = ctypes .Structure # type: ignore[assignment]
284
284
285
285
lib_file .seek (seek )
286
286
return BaseClass , magic_number
@@ -298,18 +298,18 @@ def extract_macosx_min_system_version(path_to_lib: str): # noqa: C901
298
298
299
299
if magic_number in [FAT_MAGIC , FAT_CIGAM_64 ]:
300
300
301
- class FatHeader (BaseClass ):
301
+ class FatHeader (BaseClass ): # type: ignore[misc,valid-type]
302
302
_fields_ = fat_header_fields
303
303
304
304
fat_header = read_data (FatHeader , lib_file )
305
305
if magic_number == FAT_MAGIC :
306
306
307
- class FatArch (BaseClass ):
307
+ class FatArch (BaseClass ): # type: ignore[misc,valid-type]
308
308
_fields_ = fat_arch_fields
309
309
310
310
else :
311
311
312
- class FatArch (BaseClass ):
312
+ class FatArch (BaseClass ): # type: ignore[misc,valid-type,no-redef]
313
313
_fields_ = fat_arch_64_fields
314
314
315
315
fat_arch_list = [
@@ -361,17 +361,17 @@ def read_mach_header(
361
361
base_class , magic_number = get_base_class_and_magic_number (lib_file , seek )
362
362
arch = "32" if magic_number == MH_MAGIC else "64"
363
363
364
- class SegmentBase (base_class ):
364
+ class SegmentBase (base_class ): # type: ignore[misc,valid-type]
365
365
_fields_ = segment_base_fields
366
366
367
367
if arch == "32" :
368
368
369
- class MachHeader (base_class ):
369
+ class MachHeader (base_class ): # type: ignore[misc,valid-type]
370
370
_fields_ = mach_header_fields
371
371
372
372
else :
373
373
374
- class MachHeader (base_class ):
374
+ class MachHeader (base_class ): # type: ignore[misc,valid-type,no-redef]
375
375
_fields_ = mach_header_fields_64
376
376
377
377
mach_header = read_data (MachHeader , lib_file )
@@ -381,14 +381,14 @@ class MachHeader(base_class):
381
381
lib_file .seek (pos )
382
382
if segment_base .cmd == LC_VERSION_MIN_MACOSX :
383
383
384
- class VersionMinCommand (base_class ):
384
+ class VersionMinCommand (base_class ): # type: ignore[misc,valid-type]
385
385
_fields_ = version_min_command_fields
386
386
387
387
version_info = read_data (VersionMinCommand , lib_file )
388
388
return parse_version (version_info .version )
389
389
elif segment_base .cmd == LC_BUILD_VERSION :
390
390
391
- class VersionBuild (base_class ):
391
+ class VersionBuild (base_class ): # type: ignore[misc,valid-type]
392
392
_fields_ = build_version_command_fields
393
393
394
394
version_info = read_data (VersionBuild , lib_file )
@@ -397,6 +397,8 @@ class VersionBuild(base_class):
397
397
lib_file .seek (pos + segment_base .cmdsize )
398
398
continue
399
399
400
+ return None
401
+
400
402
401
403
def parse_version (version : int ) -> tuple [int , int , int ]:
402
404
x = (version & 0xFFFF0000 ) >> 16
@@ -411,8 +413,8 @@ def calculate_macosx_platform_tag(archive_root: StrPath, platform_tag: str) -> s
411
413
412
414
Example platform tag `macosx-10.14-x86_64`
413
415
"""
414
- prefix , base_version , suffix = platform_tag .split ("-" )
415
- base_version = tuple (int (x ) for x in base_version .split ("." ))
416
+ prefix , base_version_ , suffix = platform_tag .split ("-" )
417
+ base_version = tuple (int (x ) for x in base_version_ .split ("." ))
416
418
base_version = base_version [:2 ]
417
419
if base_version [0 ] > 10 :
418
420
base_version = (base_version [0 ], 0 )
@@ -457,7 +459,6 @@ def calculate_macosx_platform_tag(archive_root: StrPath, platform_tag: str) -> s
457
459
fin_base_version = "_" .join ([str (x ) for x in base_version ])
458
460
if start_version < base_version :
459
461
problematic_files = [k for k , v in versions_dict .items () if v > start_version ]
460
- problematic_files = "\n " .join (problematic_files )
461
462
if len (problematic_files ) == 1 :
462
463
files_form = "this file"
463
464
else :
@@ -469,7 +470,7 @@ def calculate_macosx_platform_tag(archive_root: StrPath, platform_tag: str) -> s
469
470
+ " or recreate "
470
471
+ files_form
471
472
+ " with lower "
472
- "MACOSX_DEPLOYMENT_TARGET: \n " + problematic_files
473
+ "MACOSX_DEPLOYMENT_TARGET: \n " + " \n " . join ( problematic_files )
473
474
)
474
475
475
476
if "MACOSX_DEPLOYMENT_TARGET" in os .environ :
0 commit comments