Adapt to renamed units in the API

Author: yaqwsx

.github/workflows/test-kikit.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        kicad-version: [v8, v9]
+        kicad-version: [v8, v9, v9-testing]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-kicad

kikit/drc.py

@@ -20,7 +20,7 @@ def roundCoord(x: int) -> int:
     # emulate that
     return round(x - 50, -4)
 
-def getItemDescription(item: pcbnew.BOARD_ITEM, units: pcbnew.EDA_UNITS = pcbnew.EDA_UNITS_MILLIMETRES):
+def getItemDescription(item: pcbnew.BOARD_ITEM, units: pcbnew.EDA_UNITS = pcbnew.EDA_UNITS_MM):
     if isV9():
         uProvider = pcbnew.UNITS_PROVIDER(pcbnew.pcbIUScale, units)
         return item.GetItemDescription(uProvider, True)
@@ -89,9 +89,9 @@ def format(self, units: Any) -> str:
     def _formatObject(self, obj: pcbnew.BOARD_ITEM, units: Any) -> str:
         p = obj.GetPosition()
         pos = "unknown"
-        if units == pcbnew.EDA_UNITS_MILLIMETRES:
+        if units == pcbnew.EDA_UNITS_MM:
             pos = f"{toMm(p[0]):.4f} mm, {toMm(p[1]):.4f} mm"
-        if units == pcbnew.EDA_UNITS_INCHES:
+        if units == pcbnew.EDA_UNITS_INCH:
             pos = f"{pcbnew.ToMils(p[0]):.1f} mil, {pcbnew.ToMils(p[1]):.1f} mil"
         return f"@({pos}): {getItemDescription(obj, units)}"
 
@@ -200,7 +200,7 @@ def runBoardDrc(board: pcbnew.BOARD, strict: bool) -> DrcReport:
         try:
             tmpFile.close()
             result = pcbnew.WriteDRCReport(board, tmpFile.name,
-                                           pcbnew.EDA_UNITS_MILLIMETRES, strict)
+                                           pcbnew.EDA_UNITS_MM, strict)
             if not result:
                 raise RuntimeError("Cannot run DRC: Unspecified KiCAD error")
             with open(tmpFile.name, encoding="utf-8") as f:
@@ -248,7 +248,7 @@ def runImpl(board, useMm, ignoreExcluded, strict, level, yieldViolation):
     import sys
     faulthandler.enable(sys.stderr)
 
-    units = pcbnew.EDA_UNITS_MILLIMETRES if useMm else EDA_UNITS_INCHES
+    units = pcbnew.EDA_UNITS_MM if useMm else pcbnew.EDA_UNITS_INCH
     report = runBoardDrc(board, strict)
     if ignoreExcluded:
         report.pruneExclusions(readBoardDrcExclusions(board))

kikit/export.py

@@ -185,7 +185,7 @@ def pasteDxfExport(board, plotDir):
     popt.SetMirror(False)
     setExcludeEdgeLayer(popt, True)
     popt.SetScale(1)
-    popt.SetDXFPlotUnits(DXF_UNITS_MILLIMETERS)
+    popt.SetDXFPlotUnits(DXF_UNITS_MM)
     popt.SetDXFPlotPolygonMode(False)
     popt.SetDrillMarksType(DRILL_MARKS_NO_DRILL_SHAPE)
 

kikit/panelize.py

@@ -2354,7 +2354,7 @@ def addPanelDimensions(self, layer: Layer, offset: KiLength) -> None:
         hDim.SetStart(toKiCADPoint((minx, miny)))
         hDim.SetEnd(toKiCADPoint((maxx, miny)))
         hDim.SetLayer(layer)
-        hDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MILLIMETRES)
+        hDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MM)
         hDim.SetSuppressZeroes(True)
         if self.chamferHeight is not None:
             hDim.SetExtensionOffset(-self.chamferHeight)
@@ -2368,7 +2368,7 @@ def addPanelDimensions(self, layer: Layer, offset: KiLength) -> None:
         vDim.SetStart(toKiCADPoint((minx, miny)))
         vDim.SetEnd(toKiCADPoint((minx, maxy)))
         vDim.SetLayer(layer)
-        vDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MILLIMETRES)
+        vDim.SetUnitsMode(pcbnew.DIM_UNITS_MODE_MM)
         vDim.SetSuppressZeroes(True)
         if self.chamferWidth is not None:
             vDim.SetExtensionOffset(-self.chamferWidth)

setup.py

@@ -58,7 +58,7 @@
     ],
     install_requires=[
         "numpy", # Required for MacOS
-        "pcbnewTransition >= 0.5.0, <=0.6",
+        "pcbnewTransition >= 0.5.2, <=0.6",
         "shapely>=2.0.3",
         "click>=7.1",
         "markdown2>=2.4",