rdev

Author: virtuald

devtools/config.py

@@ -7,29 +7,26 @@
 
 @dataclasses.dataclass
 class SubprojectConfig:
+    #: The key in `py_versions` to set the project version from
+    py_version: str
 
     #: Whether this should be built on roborio or not
     roborio: bool
 
-    #: If any managed project has one of these as a dependency, the
-    #: minimum version should be this
-    min_version: T.Optional[str] = None
-
 
 @dataclasses.dataclass
 class Parameters:
     wpilib_bin_version: str
     wpilib_bin_url: str
 
-    robotpy_build_req: str
-
     exclude_artifacts: T.Set[str]
 
     requirements: T.Dict[str, str]
 
 
 @dataclasses.dataclass
 class UpdateConfig:
+    py_versions: T.Dict[str, str]
     params: Parameters
     subprojects: T.Dict[str, SubprojectConfig]
 

devtools/subproject.py

@@ -140,7 +140,6 @@ def build_wheel(
             # Install the wheel
             self._run_pip(
                 "install",
-                "--force-reinstall",
                 "--find-links",
                 str(wheel_path),
                 "--find-links",

devtools/update_pyproject.py

@@ -8,12 +8,14 @@
 from packaging.version import Version
 import tomlkit
 
+from .config import SubprojectConfig
 from .ctx import Context
 
 
 @dataclasses.dataclass
 class ProjectInfo:
     pyproject_toml: pathlib.Path
+    cfg: SubprojectConfig
     data: tomlkit.TOMLDocument
     changed: bool = False
 
@@ -32,15 +34,8 @@ def __init__(self, ctx: Context) -> None:
         # The required versions for everything
         # - in theory projects could have different requirements, but in
         #   practice this is simpler and we haven't had issues
-        # - .. and to make life easier, we only use this for build-system.requires,
-        #   which we happen to override in CI anyways
         self.version_specs: typing.Dict[str, SpecifierSet] = {}
 
-        # robotpy-build is special
-        self.version_specs["robotpy-build"] = SpecifierSet(
-            self.cfg.params.robotpy_build_req
-        )
-
         # load all the pyproject.toml using tomlkit so we can make changes
         # and retain all the comments
         self.subprojects: typing.Dict[str, ProjectInfo] = {}
@@ -49,12 +44,17 @@ def __init__(self, ctx: Context) -> None:
                 data = tomlkit.load(fp)
 
             self.subprojects[name] = ProjectInfo(
-                pyproject_toml=project.pyproject_path, data=data
+                pyproject_toml=project.pyproject_path,
+                data=data,
+                cfg=self.cfg.subprojects[name],
             )
 
-            self.version_specs[project.pyproject_name] = SpecifierSet(
-                f"~={project.cfg.min_version}"
-            )
+            version = self.cfg.py_versions[project.cfg.py_version]
+
+            self.version_specs[project.pyproject_name] = SpecifierSet(f"=={version}")
+
+        for name, spec in self.cfg.params.requirements.items():
+            self.version_specs[name] = SpecifierSet(spec)
 
     @property
     def changed(self) -> bool:
@@ -105,7 +105,10 @@ def _update_requirements(
     def update_requirements(self):
         for info in self.subprojects.values():
             data = info.data
-            pypi_name = data["tool"]["robotpy-build"]["metadata"]["name"]
+            pypi_name = data["project"]["name"]
+
+            # update project.version
+            self._update_pyversion(info)
 
             # update build-system
             self._update_requirements(
@@ -115,57 +118,69 @@ def update_requirements(self):
                 data["build-system"]["requires"],
             )
 
-            # update tool.robotpy-build.metadata: install_requires
+            # project.dependencies
             self._update_requirements(
                 info,
                 pypi_name,
-                "metadata.install_requires",
-                data["tool"]["robotpy-build"]["metadata"]["install_requires"],
+                "project.dependencies",
+                data["project"]["dependencies"],
             )
 
     def _update_maven(self, info: ProjectInfo):
         data = info.data
-        iter = list(data["tool"]["robotpy-build"]["wrappers"].items())
-        if "static_libs" in data["tool"]["robotpy-build"]:
-            iter += list(data["tool"]["robotpy-build"]["static_libs"].items())
-        for pkg, wrapper in iter:
-            if (
-                "maven_lib_download" not in wrapper
-                or wrapper["maven_lib_download"]["artifact_id"]
-                in self.cfg.params.exclude_artifacts
-            ):
+        iter = (
+            data["tool"]["hatch"]["build"]["hooks"]
+            .get("robotpy", {})
+            .get("maven_lib_download", [])
+        )
+
+        for dl in iter:
+
+            if dl["artifact_id"] in self.cfg.params.exclude_artifacts:
                 continue
 
-            if wrapper["maven_lib_download"]["repo_url"] != self.wpilib_bin_url:
+            artifact_id = dl["artifact_id"]
+
+            if dl["repo_url"] != self.wpilib_bin_url:
                 print(
                     "* ",
-                    pkg,
+                    artifact_id,
                     "repo url:",
-                    wrapper["maven_lib_download"]["repo_url"],
+                    dl["repo_url"],
                     "=>",
                     self.wpilib_bin_url,
                 )
                 self.commit_changes.add(f"repo updated to {self.wpilib_bin_url}")
                 info.changed = True
-                wrapper["maven_lib_download"]["repo_url"] = self.wpilib_bin_url
+                dl["repo_url"] = self.wpilib_bin_url
 
-            if wrapper["maven_lib_download"]["version"] != self.wpilib_bin_version:
+            if dl["version"] != self.wpilib_bin_version:
                 print(
                     "* ",
-                    pkg,
+                    artifact_id,
                     "so version:",
-                    wrapper["maven_lib_download"]["version"],
+                    dl["version"],
                     "=>",
                     self.wpilib_bin_version,
                 )
                 self.commit_changes.add(f"lib updated to {self.wpilib_bin_version}")
                 info.changed = True
-                wrapper["maven_lib_download"]["version"] = self.wpilib_bin_version
+                dl["version"] = self.wpilib_bin_version
 
     def update_maven(self):
         for data in self.subprojects.values():
             self._update_maven(data)
 
+    def _update_pyversion(self, info: ProjectInfo):
+        current_version = info.data["project"]["version"]
+        version = self.cfg.py_versions[info.cfg.py_version]
+
+        if current_version != version:
+            name = info.data["project"]["name"]
+            print(f"* {name} {current_version!r} => {version!r}")
+            self.commit_changes.add(f"{name} updated to {version}")
+            info.changed = True
+
     def update(self):
         self.update_maven()
         self.update_requirements()

rdev.toml

@@ -1,113 +1,123 @@
 #
 # This is used by ./rdev.sh to manage the various robotpy packages
 #
+# allwpilib-based python wheel versioning is xxxx.x.x.y:
+# - x is the upstream version
+# - y are specific robotpy patches when we release out of band
+#
+# Beta releases are always YEAR.0.0bX[.postX]
+#
+
+[py_versions]
+
+# Usually the same as wpilib_bin_version
+native = "2025.3.2"
+
+# Usually similar to native, but subminor version is bumped for bugfixes
+wrapper = "2025.3.2.3"
 
 [params]
 
 wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release"
 wpilib_bin_version = "2025.3.2"
 #wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development"
 
-# Don't update these artifacts
+# Don't update these maven artifacts
 exclude_artifacts = [
     "opencv-cpp"
 ]
 
-robotpy_build_req = "~=2025.1.0"
-
 [params.requirements]
-# semiwrap = "TODO"
-hatch-meson = "0.1"
-hatch-nativelib = "~=0.1"
-hatch-robotpy = "~=0.1"
+semiwrap = "~=0.1"
+hatch-meson = "~=0.1"
+hatch-nativelib = "~=0.2.0"
+hatch-robotpy = "~=0.2"
 
 
-#
-# Subproject configuration
-#
-# allwpilib-based package versioning is xxxx.x.x.y:
-# - x is the upstream version
-# - y are specific robotpy patches when we release out of band
-#
-# Beta releases are always YEAR.0.0bX[.postX]
-#
-
-# native projects use exact requirements
 [subprojects."native.wpiutil"]
+py_version = "native"
 roborio = true
 
 [subprojects."native.wpinet"]
+py_version = "native"
 roborio = true
 
 [subprojects."native.ntcore"]
+py_version = "native"
 roborio = true
 
 [subprojects."native.wpihal"]
+py_version = "native"
 roborio = true
 
 [subprojects."native.wpimath"]
+py_version = "native"
 roborio = true
 
 [subprojects."native.apriltag"]
+py_version = "native"
 roborio = true
 
 [subprojects."native.wpilib"]
+py_version = "native"
 roborio = true
 
 [subprojects."native.romi"]
+py_version = "native"
 roborio = false
 
 [subprojects."native.xrp"]
+py_version = "native"
 roborio = false
 
 [subprojects."robotpy-wpiutil"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = true
 
 [subprojects."robotpy-wpinet"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = true
 
-[subprojects.pyntcore]
-min_version = "2025.3.2"
+[subprojects."pyntcore"]
+py_version = "wrapper"
 roborio = true
 
 [subprojects."robotpy-hal"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = true
 
 [subprojects."robotpy-wpimath"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = true
 
 [subprojects."robotpy-cscore"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = true
 
 [subprojects."robotpy-apriltag"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = true
 
 [subprojects."robotpy-wpilib"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = true
 
 [subprojects."robotpy-halsim-ds-socket"]
-min_version = "2025.3.2"
+py_version = "native"
 roborio = false
 
 [subprojects."robotpy-halsim-ws"]
-min_version = "2025.3.2"
+py_version = "native"
 roborio = false
 
 [subprojects."robotpy-halsim-gui"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = false
 
 [subprojects."robotpy-romi"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = false
 
 [subprojects."robotpy-xrp"]
-min_version = "2025.3.2"
+py_version = "wrapper"
 roborio = false

subprojects/robotpy-wpiutil/pyproject.toml

@@ -18,7 +18,6 @@ authors = [
 license = "BSD-3-Clause"
 dependencies = [
     "native.wpiutil==2025.3.2",
-    "msvc-runtime>=14.42.34433; platform_system == 'Windows'"
 ]
 
 [project.urls]