Refactor rdev

Author: virtuald

devtools/ci.py

@@ -50,9 +50,8 @@ def build_other_wheels(ctx: Context, no_test: bool):
             continue
 
         with ctx.handle_exception(project.name):
-            project.install_build_deps(
-                wheel_path=ctx.wheel_path, other_wheel_path=ctx.other_wheel_path
-            )
+            ctx.install_build_deps(subproject=project)
+
             project.build_wheel(
                 wheel_path=ctx.wheel_path,
                 other_wheel_path=ctx.other_wheel_path,

devtools/ctx.py

@@ -1,5 +1,4 @@
 import contextlib
-import os
 import pathlib
 import subprocess
 import sys
@@ -10,6 +9,7 @@
 
 from . import config
 from .subproject import Subproject
+from .util import run_pip
 
 
 class Context:
@@ -77,3 +77,43 @@ def handle_exception(self, msg: str):
 
             print(f"ERROR: {msg}: {e}", file=sys.stderr)
             sys.exit(1)
+
+    @property
+    def internal_pyprojects(self):
+        if not hasattr(self, "_internal_pyprojects"):
+            self._internal_pyprojects = [
+                s.pyproject_name for s in self.subprojects.values()
+            ]
+        return self._internal_pyprojects
+
+    def install_build_deps(
+        self,
+        *,
+        subproject: Subproject,
+    ):
+        # separate requirements into internal and external
+        internal = []
+        external = []
+
+        for req in subproject.build_requires:
+            if req.name in self.internal_pyprojects:
+                internal.append(req)
+            else:
+                external.append(req)
+
+        if external:
+            run_pip(
+                "install",
+                *[str(req) for req in external],
+            )
+
+        if internal:
+            run_pip(
+                "install",
+                "--no-index",
+                "--find-links",
+                str(self.wheel_path),
+                "--find-links",
+                str(self.other_wheel_path),
+                *[str(req) for req in internal],
+            )

devtools/subproject.py

@@ -1,6 +1,4 @@
 import pathlib
-import subprocess
-import shlex
 import shutil
 import sys
 import tempfile
@@ -10,6 +8,7 @@
 import tomli
 
 from .config import SubprojectConfig
+from .util import run_cmd, run_pip
 
 
 class Subproject:
@@ -43,36 +42,14 @@ def is_meson_project(self) -> bool:
     # Tasks
     #
 
-    def _cmd(self, *args: str, cwd=None):
-        print("+", shlex.join(args))
-        subprocess.check_call(args, cwd=cwd)
-
-    def _run_pip(self, *args: str, cwd=None):
-        self._cmd(
-            sys.executable, "-m", "pip", "--disable-pip-version-check", *args, cwd=cwd
-        )
-
-    def install_build_deps(
-        self, *, wheel_path: pathlib.Path, other_wheel_path: pathlib.Path
-    ):
-        self._run_pip(
-            "install",
-            "--no-index",
-            "--find-links",
-            str(wheel_path),
-            "--find-links",
-            str(other_wheel_path),
-            *[str(req) for req in self.build_requires],
-        )
-
     def develop(self):
-        self._run_pip("install", "-v", "-e", ".", "--no-build-isolation", cwd=self.path)
+        run_pip("install", "-v", "-e", ".", "--no-build-isolation", cwd=self.path)
 
     def uninstall(self):
-        self._run_pip("uninstall", "-y", self.pyproject_name)
+        run_pip("uninstall", "-y", self.pyproject_name)
 
     def update_init(self):
-        self._cmd(
+        run_cmd(
             sys.executable,
             "-m",
             "semiwrap",
@@ -88,17 +65,13 @@ def test(self, *, install_requirements=False):
         if install_requirements:
             requirements = tests_path / "requirements.txt"
             if requirements.exists():
-                self._cmd(
-                    sys.executable,
-                    "-m",
-                    "pip",
-                    "--disable-pip-version-check",
+                run_pip(
                     "install",
                     "-r",
                     str(requirements),
                 )
 
-        self._cmd(
+        run_cmd(
             sys.executable,
             "run_tests.py",
             cwd=tests_path,
@@ -120,7 +93,7 @@ def build_wheel(
 
         with tempfile.TemporaryDirectory() as td:
             # I wonder if we should use hatch build instead?
-            self._cmd(
+            run_cmd(
                 sys.executable,
                 "-m",
                 "build",
@@ -138,7 +111,7 @@ def build_wheel(
 
         if install:
             # Install the wheel
-            self._run_pip(
+            run_pip(
                 "install",
                 "--find-links",
                 str(wheel_path),

devtools/util.py

@@ -1,3 +1,6 @@
+import shlex
+import subprocess
+import sys
 import typing
 
 from validobj import errors
@@ -39,3 +42,12 @@ def parse_input(value: typing.Any, spec: typing.Type[T], fname) -> T:
         return validobj.validation.parse_input(value, spec)
     except errors.ValidationError as ve:
         raise _convert_validation_error(fname, ve) from None
+
+
+def run_cmd(*args: str, cwd=None):
+    print("+", shlex.join(args))
+    subprocess.check_call(args, cwd=cwd)
+
+
+def run_pip(*args: str, cwd=None):
+    run_cmd(sys.executable, "-m", "pip", "--disable-pip-version-check", *args, cwd=cwd)