Merge pull request #205 from robotpy/2027-dev

2027.0.0-alpha-3

Author: virtuald

.github/workflows/dist.yml

@@ -131,11 +131,11 @@ jobs:
         - "macos-14" # arm64
         - "windows-2022"
         python_version:
-        - '3.9'
         - '3.10'
         - '3.11'
         - '3.12'
         - '3.13'
+        - '3.14'
         include:
         - os: ubuntu-24.04-arm
           python_version: '3.11'
@@ -146,6 +146,9 @@ jobs:
         - os: ubuntu-24.04-arm
           python_version: '3.13'
           container: python:3.13-bookworm
+        - os: ubuntu-24.04-arm
+          python_version: '3.14'
+          container: python:3.14-bookworm
 
     container: ${{ matrix.container }}
 
@@ -236,9 +239,9 @@ jobs:
       max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
       matrix:
         os:
-        - container: wpilib/systemcore-cross-ubuntu:2025-22.04-py313
+        - container: wpilib/systemcore-cross-ubuntu:2026-24.04-py314
           name: systemcore
-        - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py313
+        - container: wpilib/raspbian-cross-ubuntu:2027-bookworm-24.04-py313
           name: raspbian
 
     container:
@@ -274,19 +277,22 @@ jobs:
       max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
       matrix:
         os:
-        - container: wpilib/systemcore-cross-ubuntu:2025-22.04-py313
+        - container: wpilib/systemcore-cross-ubuntu:2026-24.04-py314
           name: systemcore
           base: systemcore
 
-        - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py311
+        - container: wpilib/raspbian-cross-ubuntu:2027-bookworm-24.04-py311
           name: raspbian-py311
           base: raspbian
-        - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py312
+        - container: wpilib/raspbian-cross-ubuntu:2027-bookworm-24.04-py312
           name: raspbian-py312
           base: raspbian
-        - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py313
+        - container: wpilib/raspbian-cross-ubuntu:2027-bookworm-24.04-py313
           name: raspbian-py313
           base: raspbian
+        - container: wpilib/raspbian-cross-ubuntu:2027-bookworm-24.04-py314
+          name: raspbian-py314
+          base: raspbian
 
     container:
       image: "${{ matrix.os.container }}"

README.md

@@ -42,7 +42,11 @@ Development environment
 -----------------------
 
 To install all robotpy packages in [editable mode](https://packaging.python.org/en/latest/guides/distributing-packages-using-setuptools/#working-in-development-mode)
-run this:
+first run this to install dependencies:
+
+    ./rdev.sh install-prereqs
+
+Then each time you want to build everything:
 
     ./rdev.sh develop
 
@@ -55,7 +59,7 @@ rebuild an individual package:
 
     ./rdev.sh develop NAME
 
-It can be a slow process,see the [robotpy-build documentation](https://robotpy-build.readthedocs.io/en/stable/tips.html)
+It can be a slow process, see the [semiwrap documentation](https://semiwrap.readthedocs.io/en/stable/tips.html)
 for tips to make it more efficient.
 
 Cross Compilation

devtools/__main__.py

@@ -7,6 +7,8 @@
 from .ctx import Context
 from . import ci
 from . import update_pyproject
+from . import util
+
 
 #
 # Environment variables for configuring the builds
@@ -61,6 +63,29 @@ def develop(ctx: Context, package: str):
             project.develop()
 
 
+@main.command()
+@click.pass_obj
+def install_prereqs(ctx: Context):
+    """Install developer build dependencies before running develop"""
+
+    reqs = set()
+    reqs.add("editables")
+    reqs.add("numpy")
+    reqs.add("pytest")
+
+    repo_deps = set()
+
+    for project in ctx.subprojects.values():
+        with ctx.handle_exception(project.name):
+            repo_deps.add(project.pyproject_name)
+
+            for req in project.build_requires + project.dependencies:
+                if req.name not in repo_deps:
+                    reqs.add(req)
+
+    util.run_pip("install", *map(str, reqs))
+
+
 @main.command()
 @click.pass_obj
 def scan_headers(ctx: Context):

devtools/config.py

@@ -24,6 +24,9 @@ class Parameters:
     wpilib_bin_version: str
     wpilib_bin_url: str
 
+    #: renames [project.entry-points.KEY*] to [project.entry-points.VALUE]
+    entrypoints: T.Dict[str, str]
+
     exclude_artifacts: T.Set[str]
 
     requirements: T.Dict[str, str]

devtools/subproject.py

@@ -132,8 +132,9 @@ def build_wheel(
 
             tdp = pathlib.Path(td)
             twhl = list(tdp.glob("*.whl"))[0]
-            dst_whl = wheel_path / self._fix_wheel_name(twhl.name)
+            dst_whl = wheel_path / self._fix_wheel_name(twhl)
             shutil.move(twhl, dst_whl)
+            print("Wrote wheel to", dst_whl)
 
         if install:
             # Install the wheel
@@ -147,19 +148,46 @@ def build_wheel(
             )
 
     _adjust_wheel_tags = {
-        # pypi only accepts manylinux wheels, and we know we're compatible
-        # TODO(davo): use auditwheel to fix the tags instead
-        "linux_x86_64": "manylinux_2_35_x86_64",
-        "linux_aarch64": "manylinux_2_36_aarch64",
         # needed for compatibility with python compiled with older xcode
         "macosx_11_0_x86_64": "macosx_10_16_x86_64",
         "macosx_12_0_x86_64": "macosx_10_16_x86_64",
     }
 
-    def _fix_wheel_name(self, name: str) -> str:
-        for old, new in self._adjust_wheel_tags.items():
-            old_whl = f"{old}.whl"
-            new_whl = f"{new}.whl"
-            if name.endswith(old_whl):
-                name = f"{name[:-len(old_whl)]}{new_whl}"
+    def _fix_wheel_name(self, wheel_path: pathlib.Path) -> str:
+        if sys.platform == "linux":
+            name = self._fix_linux_wheel_name(wheel_path)
+        else:
+            name = wheel_path.name
+            for old, new in self._adjust_wheel_tags.items():
+                old_whl = f"{old}.whl"
+                new_whl = f"{new}.whl"
+                if name.endswith(old_whl):
+                    name = f"{name[:-len(old_whl)]}{new_whl}"
+
         return name
+
+    def _fix_linux_wheel_name(self, wheel_path: pathlib.Path) -> str:
+        # inspired by https://github.com/hsorby/renamewheel, Apache license
+
+        from auditwheel.error import NonPlatformWheel, WheelToolsError
+        from auditwheel.wheel_abi import analyze_wheel_abi
+        from auditwheel.wheeltools import get_wheel_architecture, get_wheel_libc
+
+        try:
+            arch = get_wheel_architecture(wheel_path.name)
+        except (WheelToolsError, NonPlatformWheel):
+            arch = None
+
+        try:
+            libc = get_wheel_libc(wheel_path.name)
+        except WheelToolsError:
+            libc = None
+
+        try:
+            winfo = analyze_wheel_abi(libc, arch, wheel_path, frozenset(), True, True)
+        except NonPlatformWheel:
+            return wheel_path.name
+        else:
+            parts = wheel_path.name.split("-")
+            parts[-1] = winfo.overall_policy.name
+            return "-".join(parts) + ".whl"

devtools/update_pyproject.py

@@ -40,7 +40,7 @@ def __init__(self, ctx: Context) -> None:
         # and retain all the comments
         self.subprojects: typing.Dict[str, ProjectInfo] = {}
         for name, project in self.ctx.subprojects.items():
-            with open(project.pyproject_path, "r") as fp:
+            with open(project.pyproject_path) as fp:
                 data = tomlkit.load(fp)
 
             self.subprojects[name] = ProjectInfo(
@@ -68,6 +68,31 @@ def wpilib_bin_version(self) -> str:
     def wpilib_bin_url(self) -> str:
         return self.cfg.params.wpilib_bin_url
 
+    def _update_entrypoints(
+        self,
+        info: ProjectInfo,
+        pypi_name: str,
+    ):
+        data = info.data
+        eps = data["project"].get("entry-points")
+        if eps is None:
+            return
+
+        for name in list(eps.keys()):
+            for prefix, replace in self.cfg.params.entrypoints.items():
+                if name.startswith(prefix):
+                    if name != replace:
+                        eps[replace] = eps[name]
+                        del eps[name]
+                        print(
+                            f"* {pypi_name}: entry-points.{name} -> entry-points.{replace}"
+                        )
+                        self.commit_changes.add(
+                            f"{pypi_name}: entry-points.{name} -> entry-points.{replace}"
+                        )
+                        info.changed = True
+                    break
+
     def _update_requirements(
         self,
         info: ProjectInfo,
@@ -126,6 +151,12 @@ def update_requirements(self):
                 data["project"]["dependencies"],
             )
 
+            # project.entry-points
+            self._update_entrypoints(
+                info,
+                pypi_name,
+            )
+
     def _update_maven(self, info: ProjectInfo):
         data = info.data
         iter = (

rdev.toml

@@ -11,18 +11,18 @@
 [py_versions]
 
 # Usually the same as wpilib_bin_version
-native = "2027.0.0a2"
+native = "2027.0.0a3"
 
 # Will eventually sync with native
-halsim_native = "2027.0.0a2"
+halsim_native = "2027.0.0a3"
 
 # Usually similar to native, but subminor version is bumped for bugfixes
 # - ./rdev.sh ci check_tag will fail if this doesn't match current tag
-wrapper = "2027.0.0a2"
+wrapper = "2027.0.0a3"
 
 [params]
 
-wpilib_bin_version = "2027.0.0-alpha-2"
+wpilib_bin_version = "2027.0.0-alpha-3"
 wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release-2027"
 # wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development-2027"
 
@@ -33,12 +33,20 @@ exclude_artifacts = [
 
 robot_wheel_platform = "linux-systemcore"
 
+[params.entrypoints]
+# prefix = "actual"
+# - ensures that [project.entry-points.prefix*] are renamed to "actual", which
+#   makes it easy to upgrade them each year (https://github.com/robotpy/robotpy-cli/issues/5)
+# - also reminds me that we have to bump it every year ^_^
+robotpy_sim = "robotpy_sim.2027"
+robotpy_cli = "robotpy_cli.2027"
+
 [params.requirements]
-semiwrap = "~=0.1.7"
-hatch-meson = "~=0.1.0b2"
+semiwrap = "~=0.2.1"
+hatch-meson = "~=0.1.0"
 hatch-nativelib = "~=0.2.0"
 hatch-robotpy = "~=0.2.1"
-
+robotpy-cli = "~=2027.0.0a1"
 
 [subprojects."robotpy-native-wpiutil"]
 py_version = "native"

rdev_requirements.txt

@@ -10,3 +10,5 @@ validobj~=1.2
 
 ninja
 msvc-runtime>=14.42.34433; platform_system == 'Windows'
+
+auditwheel~=6.4; platform_system == 'Linux'

subprojects/pyntcore/pyproject.toml

@@ -1,30 +1,30 @@
 [build-system]
 build-backend = "hatchling.build"
 requires = [
-    "semiwrap~=0.1.7",
-    "hatch-meson~=0.1.0b2",
+    "semiwrap~=0.2.1",
+    "hatch-meson~=0.1.0",
     "hatch-robotpy~=0.2.1",
     "hatchling",
-    "robotpy-native-ntcore==2027.0.0a2",
-    "robotpy-wpiutil==2027.0.0a2",
-    "robotpy-wpinet==2027.0.0a2",
-    "robotpy-wpilog==2027.0.0a2",
+    "robotpy-native-ntcore==2027.0.0a3",
+    "robotpy-wpiutil==2027.0.0a3",
+    "robotpy-wpinet==2027.0.0a3",
+    "robotpy-wpilog==2027.0.0a3",
 ]
 
 
 [project]
 name = "pyntcore"
-version = "2027.0.0a2"
+version = "2027.0.0a3"
 description = "Binary wrappers for the FRC ntcore library"
 authors = [
     {name = "RobotPy Development Team", email = "[email protected]"},
 ]
 license = "BSD-3-Clause"
 dependencies = [
-    "robotpy-native-ntcore==2027.0.0a2",
-    "robotpy-wpiutil==2027.0.0a2",
-    "robotpy-wpinet==2027.0.0a2",
-    "robotpy-wpilog==2027.0.0a2",
+    "robotpy-native-ntcore==2027.0.0a3",
+    "robotpy-wpiutil==2027.0.0a3",
+    "robotpy-wpinet==2027.0.0a3",
+    "robotpy-wpilog==2027.0.0a3",
 ]
 
 [project.urls]

subprojects/pyntcore/tests/test_api.py

@@ -4,8 +4,6 @@
 # works correctly
 #
 
-from __future__ import print_function
-
 import pytest
 
 import logging