Skip to content

Commit 6641ccc

Browse files
committed
Roll back netgen and mypy updates
New netgen breaks Salome SMESH compilation, and new mypy breaks stubgen.
1 parent d230ff4 commit 6641ccc

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎compile_all.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@
7676
"pydantic_core",
7777
"watchfiles",
7878
"lxml",
79-
# Force pure-Python mypy (its wheels are mypyc-compiled, won't load under python_d).
80-
# Keep the pin at 1.18.2; newer mypy needs the compiled-only librt.Let's w
79+
# Force pure-Python mypy; its release wheels are mypyc-compiled and will not load under
80+
# python_d. Keep the pin at 1.18.2, because 1.19.0 added a hard dependency on librt and
81+
# 2.x additionally requires ast-serialize, neither of which ships a pure-Python wheel.
8182
"mypy",
8283
)
8384

‎config.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"FreeCAD-version":"26.3.0",
3-
"LibPack-version":"3.5.4",
3+
"LibPack-version":"3.5.5",
44
"content": [
55
{
66
"name":"libiconv",
@@ -85,7 +85,7 @@
8585
"lark==1.3.1",
8686
"lxml==6.1.1",
8787
"matplotlib==3.11.1",
88-
"mypy==2.3.0",
88+
"mypy==1.18.2",
8989
"nltk==3.10.2",
9090
"numpy==2.5.1",
9191
"packaging==26.3",
@@ -220,7 +220,8 @@
220220
{
221221
"name":"netgen",
222222
"git-repo":"https://github.com/NGSolve/netgen",
223-
"git-ref":"v6.2.2606",
223+
"git-ref":"v6.2.2604",
224+
"note": "Do not bump past 6.2.2604 until FreeCAD's salomesmesh NETGENPlugin is ported. 6.2.2606 makes Segment's data members private and deletes si, edgenr, singedge_left, singedge_right, seginfo, domin, domout, tlosurf, geominfo, surfnr1, surfnr2, meshdocval and is_curved, hoisting that state into a new EdgeDescriptor table reached via mesh.GetEdgeDescriptor(seg.GetIndex()). EdgePointGeomInfo loses edgenr, body, u and v in favour of a nested PointGeomInfo gi. NETGENPlugin_Mesher.cpp writes those fields directly in roughly 70 places and fails to compile.",
224225
"patches":[
225226
"patches/netgen-02-arm64-msvc-time-counter.patch",
226227
"patches/netgen-03-msvc-runtime-debug-aware.patch",

0 commit comments

Comments
 (0)