optimize

Author: KumaTea

src/build.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import argparse
 import subprocess
 from config import *
@@ -45,10 +46,12 @@ def build(ver: str, py_path: str, plat: str = 'win', since: str = None, only: st
         if since:
             index = packages.index(since)
             if index > 0:
-                packages = packages[index - 1:]
+                packages = ['NotARealPackage'] * (index - 1) + packages[index - 1:]
 
     pbar = tqdm(packages)
     for pkg in pbar:
+        if pkg == 'NotARealPackage':
+            continue
         pbar.set_description(f'S: {len(success)}, F: {len(failed)}, C: {pkg}')
         flags = ''
         if only:
@@ -59,9 +62,7 @@ def build(ver: str, py_path: str, plat: str = 'win', since: str = None, only: st
                    f'--find-links https://pypy.kmtea.eu/wheels.html')
         try:
             result = subprocess.run(command.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            if f'Successfully installed {pkg}' in (result.stdout.decode('utf-8') + result.stdout.decode('utf-8')):
-                success.append(pkg)
-            elif f'Requirement already satisfied: {pkg}' in (result.stdout.decode('utf-8') + result.stdout.decode('utf-8')):
+            if ('error' not in result.stderr.decode('utf-8').lower()) or (f'Successfully installed {pkg}'.lower() in result.stdout.decode('utf-8').lower()):
                 success.append(pkg)
             else:
                 failed.append(pkg)
@@ -71,6 +72,12 @@ def build(ver: str, py_path: str, plat: str = 'win', since: str = None, only: st
                 print('########## ERROR ##########')
                 print(result.stderr.decode('utf-8'))
                 print('##########  END  ##########')
+        except KeyboardInterrupt:
+            print('Exiting...')
+            print(f'{success=}')
+            print(f'{failed=}')
+            print(f'{pkg=}')
+            sys.exit(1)
         except Exception as e:
             failed.append(pkg)
             print(e)

src/build_linux.py

@@ -7,7 +7,7 @@ def get_pypy(ver: str):
     return f'/opt/python/pp{ver.replace(".", "")}-pypy{ver.replace(".", "")}_pp73/bin/python3'
 
 
-def build_linux(ver: str = None, since: str = None):
+def build_linux(ver: str = None, since: str = None, only: str = None):
     if not ver:
         ver = args.ver
     if ver not in build_versions:
@@ -21,12 +21,15 @@ def build_linux(ver: str = None, since: str = None):
         ver=ver,
         py_path=pypy_path,
         plat=plat,
-        since=since
+        since=since,
+        only=only
     )
 
 
 if __name__ == '__main__':
     build_linux(
         ver=args.ver,
-        since=args.since
+        since=args.since,
+        only=args.only
     )
+

src/pick_uploads.py

@@ -16,6 +16,9 @@
 
 if __name__ == '__main__':
     os.makedirs(TO_UPLOAD, exist_ok=True)
+    os.makedirs(os.path.join(TO_UPLOAD, 'nomany'), exist_ok=True)
+    for ver in VERS:
+        os.makedirs(os.path.join(TO_UPLOAD, ver), exist_ok=True)
 
     with open(CURRENT_INDEX, 'r', encoding='utf-8') as f:
         current_index = f.read()
@@ -40,15 +43,17 @@
                 if pkg_name in ver_wheel and pkg_ver in ver_wheel and pkg_python in ver_wheel:
                     if ver_wheel not in current_index:
                         done = True
+                        shutil.move(
+                            os.path.join(LINUX_WHEELS_MANY_ORIGIN_DIR, wheel),
+                            os.path.join(TO_UPLOAD, ver, wheel)
+                        )
                         break
         if not done:
             shutil.move(
                 os.path.join(LINUX_WHEELS_MANY_ORIGIN_DIR, wheel),
-                os.path.join(TO_UPLOAD, wheel)
+                os.path.join(TO_UPLOAD, 'nomany', wheel)
             )
 
-    for ver in VERS:
-        os.makedirs(os.path.join(TO_UPLOAD, ver), exist_ok=True)
     for wheel in tqdm(os.listdir(os.path.join(TO_UPLOAD, 'nomany'))):
         for ver in VERS:
             if f'pp{ver.replace(".", "")}-pypy{ver.replace(".", "")}' in wheel: