Save the time for cleanup / back to run (#113)

* Save the time for cleanup / back to run

* fix runtime

builder/__main__.py

@@ -68,7 +68,7 @@
     "--remote", required=True, type=str, help="Remote URL pass to upload plugin."
 )
 @click.option(
-    "--timeout", default=330, type=int, help="Max runtime for pip before abort."
+    "--timeout", default=345, type=int, help="Max runtime for pip before abort."
 )
 def builder(
     apk: str,

builder/pip.py

@@ -25,7 +25,7 @@ def build_wheels_package(
     constraint_cmd = f"--constraint {constraint}" if constraint else ""
 
     run_command(
-        f'pip3 wheel --progress-bar off --no-binary "{skip_binary}" --wheel-dir {output} --find-links {index} {constraint_cmd} "{package}"',
+        f'pip3 wheel --progress-bar off --no-clean --no-binary "{skip_binary}" --wheel-dir {output} --find-links {index} {constraint_cmd} "{package}"',
         env=build_env,
         timeout=timeout,
     )
@@ -50,7 +50,7 @@ def build_wheels_requirement(
     constraint_cmd = f"--constraint {constraint}" if constraint else ""
 
     run_command(
-        f'pip3 wheel --progress-bar off --no-binary "{skip_binary}" --wheel-dir {output} --find-links {index} {constraint_cmd} --requirement {requirement}',
+        f'pip3 wheel --progress-bar off --no-clean --no-binary "{skip_binary}" --wheel-dir {output} --find-links {index} {constraint_cmd} --requirement {requirement}',
         env=build_env,
         timeout=timeout,
     )
@@ -65,7 +65,7 @@ def build_wheels_local(index: str, output: Path) -> None:
     build_env["MAKEFLAGS"] = f"-j{cpu}"
 
     run_command(
-        f"pip3 wheel --progress-bar off --wheel-dir {output} --find-links {index} .",
+        f"pip3 wheel --progress-bar off --no-clean --wheel-dir {output} --find-links {index} .",
         env=build_env,
     )
 

builder/utils.py

@@ -2,7 +2,6 @@
 from pathlib import Path
 import os
 import re
-import signal
 import subprocess
 import sys
 from typing import Optional, Dict
@@ -43,26 +42,12 @@ def run_command(
     cmd: str, env: Optional[Dict[str, str]] = None, timeout: Optional[int] = None
 ) -> None:
     """Implement subprocess.run but handle timeout different."""
-    # pylint: disable=subprocess-popen-preexec-fn
-    process = subprocess.Popen(
+    subprocess.run(
         cmd,
         shell=True,
+        check=True,
         stdout=sys.stdout,
         stderr=sys.stderr,
-        stdin=subprocess.DEVNULL,
         env=env,
-        preexec_fn=os.setsid,
+        timeout=timeout,
     )
-
-    # Run command and wait
-    try:
-        process.communicate(timeout=timeout)
-    except Exception:
-        os.kill(os.getpgid(process.pid), signal.SIGTERM)
-        raise
-
-    # Process return code
-    if process.returncode == 0:
-        return
-
-    raise subprocess.CalledProcessError(process.returncode, cmd)

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = "1.12.2"
+VERSION = "1.12.3"
 
 setup(
     name="builder",