sat #19980 : Remove obsolete use of sphinxcontrib_napoleon and pockets products

[tools/sat_salome.git] / applications / SALOME-master.pyconf

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index b57f0f9a8a6bfc1f277641b2bfcc8cc0efc3ec1f..b329dac89174eacc3834ea5557355fb5ccba255d 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -30,7 +30,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.58.0'
-        CAS : 'CR740-SALOME-PATCH'
+        CAS : 'V7_5_0'
         certifi : '2018.8.24'
         cgns : '3.3.1'
         chardet : '3.0.4'
@@ -71,12 +71,12 @@ APPLICATION :
         opencv : '3.2.0'
         openssl : "native"
         ospray : '1.8.4'
+        #openturns: '1.16'
         packaging : '17.1'
         ParaView : '5.8.0'
         petsc : '3.14.0'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
-        pockets : '0.6.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
@@ -94,7 +94,6 @@ APPLICATION :
         six : '1.10.0'
         snowballstemmer : '1.2.1'
         Sphinx : '1.7.6'
-        sphinxcontrib_napoleon : '0.6.1'
         sphinxcontrib_websupport : '1.1.0'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
@@ -144,7 +143,7 @@ APPLICATION :
         'PY2CPP' : {tag: 'v2.0'}
         'ADAO'
         'ADAO_INTERFACE'
-        'PARAVISADDONS' : {tag : 'kw/issue23'}
+        'PARAVISADDONS'
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -231,6 +230,12 @@ __overwrite__ :
                                                 ]
   }
 
+  # {
+  #   #
+  #   __condition__ : "VARS.dist in ['CO7']"
+  #   'PRODUCTS.openturns.default.cmake_options' : " -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python -DUSE_TBB=OFF" # essayer avec un nouveau gcc
+  # }
+
   {
     __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
     'APPLICATION.products.tbb' : '4.4'