chore: use same convert_to_generic_platform_wheel.py script as cmake

This prepares for `universal2` wheels and allows to create `py2.py3` wheels

Author: mayeut

scripts/convert_to_generic_platform_wheel.py

@@ -41,7 +41,7 @@ def _to_generic_pyver(pyver_tags):
     return ['py%s' % tag[2] if tag.startswith('cp') else tag for tag in pyver_tags]
 
 
-def _convert_to_generic_platform_wheel(wheel_ctx):
+def _convert_to_generic_platform_wheel(wheel_ctx, py2_py3, additional_platforms):
     """Switch to generic python tags and remove ABI tags from a wheel
 
     Convert implementation specific python tags to their generic equivalent and
@@ -51,6 +51,10 @@ def _convert_to_generic_platform_wheel(wheel_ctx):
     ----------
     wheel_ctx : InWheelCtx
         An open wheel context
+    py2_py3: Bool
+        Whether the pyver tag shall be py2.py3 or just the one inferred from the wheel name
+    additional_platforms : Optional[Iterable[str]]
+        An optional iterable of additional platform to add to the wheel
     """
 
     abi_tags = ['none']
@@ -69,7 +73,14 @@ def _convert_to_generic_platform_wheel(wheel_ctx):
 
     # Update wheel filename
     fparts = wf.parsed_filename.groupdict()
-    original_platform_tags = fparts['plat'].split('.')
+    platform_tags = fparts['plat'].split('.')
+    logger.debug('Previous platform tags: %s', ', '.join(platform_tags))
+    if additional_platforms:
+        platform_tags = list(sorted(set(platform_tags + [p for p in additional_platforms])))
+        fparts['plat'] = '.'.join(platform_tags)
+        logger.debug('New platform tags ....: %s', ', '.join(platform_tags))
+    else:
+        logger.debug('No platform tags change needed.')
 
     original_abi_tags = fparts['abi'].split('.')
     logger.debug('Previous ABI tags: %s', ', '.join(original_abi_tags))
@@ -82,6 +93,10 @@ def _convert_to_generic_platform_wheel(wheel_ctx):
     original_pyver_tags = fparts['pyver'].split('.')
     logger.debug('Previous pyver tags: %s', ', '.join(original_pyver_tags))
     pyver_tags = _to_generic_pyver(original_pyver_tags)
+    if py2_py3:
+        if len(set(["py2", "py3"]) & set(pyver_tags)) == 0:
+            raise ValueError("pyver_tags does not contain py2 nor py3")
+        pyver_tags = list(sorted(set(pyver_tags + ["py2", "py3"])))
     if pyver_tags != original_pyver_tags:
         logger.debug('New pyver tags ....: %s', ', '.join(pyver_tags))
         fparts['pyver'] = '.'.join(pyver_tags)
@@ -106,15 +121,14 @@ def _convert_to_generic_platform_wheel(wheel_ctx):
 
     # Python version, C-API version combinations
     pyc_apis = []
-    for tag in in_info_tags:
-        py_ver = '.'.join(_to_generic_pyver(tag.split('-')[0].split('.')))
+    for py_ver in pyver_tags:
         abi = 'none'
         pyc_apis.append('-'.join([py_ver, abi]))
     # unique Python version, C-API version combinations
     pyc_apis = unique_by_index(pyc_apis)
 
     # Set tags for each Python version, C-API combination
-    updated_tags = ['-'.join(tup) for tup in product(pyc_apis, original_platform_tags)]
+    updated_tags = ['-'.join(tup) for tup in product(pyc_apis, platform_tags)]
 
     if updated_tags != in_info_tags:
         del info['Tag']
@@ -128,7 +142,8 @@ def _convert_to_generic_platform_wheel(wheel_ctx):
     return out_wheel
 
 
-def convert_to_generic_platform_wheel(wheel_path, out_dir='./dist/', remove_original=False, verbose=0):
+def convert_to_generic_platform_wheel(wheel_path, out_dir='./dist/', remove_original=False, verbose=0,
+                                      py2_py3=False, additional_platforms=None):
     logging.disable(logging.NOTSET)
     if verbose >= 1:
         logging.basicConfig(level=logging.DEBUG)
@@ -140,7 +155,7 @@ def convert_to_generic_platform_wheel(wheel_path, out_dir='./dist/', remove_orig
 
     with InWheelCtx(wheel_path) as ctx:
         ctx.out_wheel = pjoin(out_dir, wheel_fname)
-        ctx.out_wheel = _convert_to_generic_platform_wheel(ctx)
+        ctx.out_wheel = _convert_to_generic_platform_wheel(ctx, py2_py3, additional_platforms)
 
     if remove_original:
         logger.info('Removed original wheel %s' % wheel_path)
@@ -169,13 +184,23 @@ def main():
                    dest='remove_original',
                    action='store_true',
                    help='Remove original wheel')
+    p.add_argument("--py2-py3",
+                   dest='py2_py3',
+                   action='store_true',
+                   help='Remove original wheel')
+    p.add_argument("-p",
+                   "--add-platform",
+                   dest='additional_platforms',
+                   action="append",
+                   help='Add a platform tag')
 
     args = p.parse_args()
 
     if not isfile(args.WHEEL_FILE):
         p.error('cannot access %s. No such file' % args.WHEEL_FILE)
 
-    convert_to_generic_platform_wheel(args.WHEEL_FILE, args.WHEEL_DIR, args.remove_original, args.verbose)
+    convert_to_generic_platform_wheel(args.WHEEL_FILE, args.WHEEL_DIR, args.remove_original, args.verbose,
+                                      args.py2_py3, args.additional_platforms)
 
 
 if __name__ == '__main__':