More temp

Author: virtuald

devtools/__main__.py

@@ -25,10 +25,11 @@
 
 
 @click.group()
+@click.option("-v", "--verbose", default=False, is_flag=True)
 @click.pass_context
-def main(ctx: click.Context):
+def main(ctx: click.Context, verbose: bool):
     """RobotPy development tool"""
-    ctx.obj = Context()
+    ctx.obj = Context(verbose)
 
 
 main.add_command(ci.ci)
@@ -40,7 +41,7 @@ def main(ctx: click.Context):
 def info(ctx: Context):
     """Display information"""
     for project in ctx.subprojects.values():
-        print(project.name, project.requires)
+        print(project.name, project.build_requires)
 
 
 @main.command()
@@ -82,7 +83,9 @@ def uninstall(ctx: Context, package: str):
 def update_init(ctx: Context):
     """Update __init__.py in all projects"""
     for project in ctx.subprojects.values():
-        project.update_init()
+        if project.is_semiwrap_project():
+            with ctx.handle_exception(f"update-init {project.name}"):
+                project.update_init()
 
 
 @main.command()

devtools/ci.py

@@ -50,10 +50,10 @@ def run(ctx: Context, no_test: bool):
     # Fix build dependencies to be == what we are building
     # - install_requires already has this via ==THIS_VERSION in robotpy-build
     for project in ctx.subprojects.values():
-        for i in range(len(project.requires)):
-            req = project.requires[i]
+        for i in range(len(project.build_requires)):
+            req = project.build_requires[i]
             if req.name in ctx.subprojects:
-                project.requires[i] = Requirement(f"{req.name}=={version}")
+                project.build_requires[i] = Requirement(f"{req.name}=={version}")
 
     for project in ctx.subprojects.values():
         project.install_build_deps(wheel_path=ctx.wheel_path)

devtools/config.py

@@ -7,7 +7,7 @@
 
 @dataclasses.dataclass
 class SubprojectConfig:
-    
+
     #: Whether this should be built on roborio or not
     roborio: bool
 
@@ -27,6 +27,7 @@ class Parameters:
 
     requirements: T.Dict[str, str]
 
+
 @dataclasses.dataclass
 class UpdateConfig:
     params: Parameters

devtools/ctx.py

@@ -1,5 +1,8 @@
+import contextlib
+import os
 import pathlib
 import subprocess
+import sys
 import sysconfig
 import typing
 
@@ -12,7 +15,8 @@
 class Context:
     """Global context used by all rdev commands"""
 
-    def __init__(self) -> None:
+    def __init__(self, verbose: bool) -> None:
+        self.verbose =verbose
         self.root_path = pathlib.Path(__file__).parent.parent
         self.subprojects_path = self.root_path / "subprojects"
         self.cfgpath = self.root_path / "rdev.toml"
@@ -33,7 +37,7 @@ def __init__(self) -> None:
         # Create a sorted dictionary of subprojects ordered by build order
         si = {p.pyproject_name: i for i, p in enumerate(subprojects)}
         ti = {
-            i: [si[r.name] for r in p.requires if r.name in si]
+            i: [si[r.name] for r in p.build_requires if r.name in si]
             for i, p in enumerate(subprojects)
         }
 
@@ -61,3 +65,14 @@ def git_is_file_dirty(self, relpath: str) -> bool:
             ["git", "status", "--porcelain", relpath], cwd=self.root_path
         ).decode("utf-8")
         return output != ""
+
+    @contextlib.contextmanager
+    def handle_exception(self, msg: str):
+        try:
+            yield
+        except Exception as e:
+            if self.verbose:
+                raise
+            
+            print(f"ERROR: {msg}: {e}",file=sys.stderr)
+            sys.exit(1)

devtools/subproject.py

@@ -22,12 +22,18 @@ def __init__(self, cfg: SubprojectConfig, path: pathlib.Path) -> None:
         with open(self.pyproject_path, "rb") as fp:
             self.pyproject_data = tomli.load(fp)
 
-        self.requires = [
+        self.build_requires = [
             Requirement(req) for req in self.pyproject_data["build-system"]["requires"]
         ]
 
         self.pyproject_name: str = self.pyproject_data["project"]["name"]
 
+    def is_semiwrap_project(self) ->bool:
+        return self.pyproject_data.get("tool", {}).get("semiwrap", None) is not None
+
+    def is_meson_project(self) -> bool:
+        return (self.path / "meson.build").exists()
+
     #
     # Tasks
     #
@@ -37,18 +43,16 @@ def _cmd(self, *args: str, cwd=None):
         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)
+        self._cmd(
+            sys.executable, "-m", "pip", "--disable-pip-version-check", *args, cwd=cwd
+        )
 
     def install_build_deps(self, *, wheel_path: pathlib.Path):
-        self._cmd(
-            sys.executable,
-            "-m",
-            "pip",
+        self._run_pip(
             "install",
-            "--disable-pip-version-check",
             "--find-links",
             str(wheel_path),
-            *[str(req) for req in self.requires],
+            *[str(req) for req in self.build_requires],
         )
 
     def develop(self):
@@ -60,8 +64,9 @@ def uninstall(self):
     def update_init(self):
         self._cmd(
             sys.executable,
-            "setup.py",
-            "update_init",
+            "-m",
+            "semiwrap",
+            "update-init",
             cwd=self.path,
         )
 

devtools/util.py

@@ -0,0 +1,41 @@
+import typing
+
+from validobj import errors
+import validobj.validation
+
+T = typing.TypeVar("T")
+
+
+class ValidationError(Exception):
+    pass
+
+
+def _convert_validation_error(fname, ve: errors.ValidationError) -> ValidationError:
+    locs = []
+    msg = []
+
+    e = ve
+    while e is not None:
+
+        if isinstance(e, errors.WrongFieldError):
+            locs.append(f".{e.wrong_field}")
+        elif isinstance(e, errors.WrongListItemError):
+            locs.append(f"[{e.wrong_index}]")
+        else:
+            msg.append(str(e))
+
+        e = e.__cause__
+
+    loc = "".join(locs)
+    if loc.startswith("."):
+        loc = loc[1:]
+    msg = "\n  ".join(msg)
+    vmsg = f"{fname}: {loc}:\n  {msg}"
+    return ValidationError(vmsg)
+
+
+def parse_input(value: typing.Any, spec: typing.Type[T], fname) -> T:
+    try:
+        return validobj.validation.parse_input(value, spec)
+    except errors.ValidationError as ve:
+        raise _convert_validation_error(fname, ve) from None

rdev_requirements.txt

@@ -10,3 +10,5 @@ validobj~=1.2
 wheel
 
 semiwrap @ git+https://github.com/robotpy/robotpy-build@semiwrap
+hatch-robotpy @ git+https://github.com/robotpy/hatch-robotpy@main
+hatch-nativelib @ git+https://github.com/robotpy/hatch-nativelib@rm-macos-relink

subprojects/robotpy-hal/pyproject.toml

@@ -34,6 +34,7 @@ version-file = "hal/version.py"
 [tool.hatch.build.hooks.meson]
 
 [tool.semiwrap]
+update_init = []
 scan_headers_ignore = [
     "hal/ChipObject.h",
     "hal/DMA.h",

subprojects/robotpy-halsim-gui/tests/test_halsim_gui.py

@@ -16,5 +16,5 @@ def test_halsim_gui():
         if fname.is_file() and fname.suffix in (".dll", ".dylib", ".so"):
             ctypes.CDLL(fname)
             loaded += 1
-    
+
     assert loaded

subprojects/robotpy-halsim-ws/tests/test_halsim_ws_client.py

@@ -14,5 +14,5 @@ def test_halsim_ws_client():
         if fname.is_file() and fname.suffix in (".dll", ".dylib", ".so"):
             ctypes.CDLL(fname)
             loaded += 1
-    
+
     assert loaded