spns #41854: remove markdown-it-py and mdurl for UB22; change permission for markdown...

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index a495844171526cca054a2bcac065e3d7208f3894..2e479895f79f04ee64ff776b21a61b8eda4248b2 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -219,20 +219,21 @@ __overwrite__ :
         'APPLICATION.products.opencv'           : '3.2.0'
         'APPLICATION.products.cminpack'         : 'native'
         'APPLICATION.products.netcdf'           : '4.6.2'
-        'APPLICATION.products.PyFMI'            : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'      }
-        'APPLICATION.products.scipy'            : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip'    } # scipy >= 1.4 - system one too old
-        'APPLICATION.products.mdurl'            : {tag: '0.1.2', base: 'no', section: 'version_0_1_2_no_pip'    }
-        'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'         }
+        'APPLICATION.products.PyFMI'            : {tag: '2.6',    base: 'no', section: 'version_2_6_no_pip'      }
+        'APPLICATION.products.scipy'            : {tag: '1.5.2',  base: 'no', section: 'version_1_5_2_no_pip'    } # scipy >= 1.4 - system one too old
+        'APPLICATION.products.mdurl'            : {tag: '0.1.2',  base: 'no', section: 'version_0_1_2_no_pip'    }
+        'APPLICATION.products.markdown_it_py'   : {tag: '3.0.0',  base: 'no', section: 'version_3_0_0_no_pip'    }
+        'APPLICATION.products.rich'             : {tag: '13.7.1', base: 'no', section: 'version_13_7_1_no_pip'   }
+        'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'          }
+        'APPLICATION.products.meshio'           : {tag: '5.3.5' , base: 'no', section: 'version_5_3_5_no_pip'    }
     }
     {
         #
         __condition__ : "VARS.dist in ['UB22.04']"
-        'APPLICATION.rm_products'               : ['TTK'] # causes crashes
+        'APPLICATION.rm_products'               : ['TTK', 'markdown_it_py', 'mdurl'] # causes crashes
         'APPLICATION.products.cmake'            : 'native' # TTK requires cmake > 3.21
         'APPLICATION.products.cftime'           : 'native'
         'APPLICATION.products.h5py'             : 'native'
-        'APPLICATION.products.markdown_it_py'   : 'native'
-        'APPLICATION.products.mdurl'            : 'native'
         'APPLICATION.products.meshio'           : 'native'
         'APPLICATION.products.netCDF4'          : 'native'
         'APPLICATION.products.rich'             : 'native'

diff --git a/products/compil_scripts/markdown-it-py-3.0.0.sh b/products/compil_scripts/markdown-it-py-3.0.0.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/products/compil_scripts/mdurl-0.1.2.sh b/products/compil_scripts/mdurl-0.1.2.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/products/rich.pyconf b/products/rich.pyconf
index 7103f9e15b011f4ba1b678f108a8cc0891ae9adf..5f53c6885566c9f6fb27581dd35cc6391d6383b4 100644 (file)
--- a/products/rich.pyconf
+++ b/products/rich.pyconf
@@ -16,7 +16,8 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'setuptools', 'markdown_it_py', 'Pygments']
+    depend : ['Python', 'setuptools', 'Pygments']
+    opt_dep: ['markdown_it_py']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'