PERSALYS Ubuntu 22: patch PyFMI: use collections.abc instead of collections

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index d616ca4a92dea79f6bd1583209dff39e4b6ed74a..e9c975bba1a5b0206d1b7bfa57998a3fbb3e9a1d 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -225,7 +225,7 @@ __overwrite__ :
         'APPLICATION.products.netcdf'      : '4.6.2'
         'APPLICATION.products.omniORB'     : '4.2.5'
         'APPLICATION.products.omniORBpy'   : '4.2.5'
-        'APPLICATION.products.PyFMI'       : {tag: '2.6',       base: 'no', section: 'version_2_6_no_pip'                     }
+        'APPLICATION.products.PyFMI'       : {tag: '2.6',       base: 'no', section: 'version_2_6_UB22_04'                    }
         'APPLICATION.products.root'        : {tag: '6.22.02',   base: 'no', section: 'version_6_22_02_UB22_04'                }
         'APPLICATION.products.medfile'     : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB22_04'                  }
         'APPLICATION.products.openturns'   : {tag: '1.20.1',    base: 'no', section: 'version_1_20_1_UB22_04'                 }

diff --git a/products/PyFMI.pyconf b/products/PyFMI.pyconf
index 1806fc65b042001baba5cd2b0cd4707ce0c9bfc1..3961bfb4f397e89b34ec67c84583c8e91a39aa9f 100644 (file)
--- a/products/PyFMI.pyconf
+++ b/products/PyFMI.pyconf
@@ -24,6 +24,7 @@ default :
       incremental : "yes"
       pip : "yes"
     }
+    patches: []
 }
 
 version_2_6_no_pip :
@@ -36,6 +37,17 @@ version_2_6_no_pip :
     }
 }
 
+version_2_6_UB22_04:
+{
+    patches: ['pyfmi-2.6-python-3.1x.01.patch']
+    compil_script : "PyFMI-2.6.sh"
+    properties:
+    {
+      incremental : "yes"
+      pip : "no"
+    }
+}
+
 version_2_5_no_pip :
 {
     compil_script : "PyFMI-2.5.sh"

diff --git a/products/patches/pyfmi-2.6-python-3.1x.01.patch b/products/patches/pyfmi-2.6-python-3.1x.01.patch
new file mode 100644 (file)
index 0000000..7ac8eb3
--- /dev/null
+++ b/products/patches/pyfmi-2.6-python-3.1x.01.patch
@@ -0,0 +1,12 @@
+diff -Naur PyFMI-PyFMI-2.6_ref/src/pyfmi/fmi_util.pyx  PyFMI-PyFMI-2.6_dev/src/pyfmi/fmi_util.pyx
+--- PyFMI-PyFMI-2.6_ref/src/pyfmi/fmi_util.pyx 2020-03-04 22:13:53.000000000 +0100
++++ PyFMI-PyFMI-2.6_dev/src/pyfmi/fmi_util.pyx 2023-04-11 15:56:56.752107408 +0200
+@@ -465,7 +465,7 @@
+                 self._strongly_connected_components(node)
+         return self.connected_components
+ """
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+ 
+     def __init__(self, iterable=None):
+         self.end = end = []