MEDCOUPLING 8.5.0 fix

diff --git a/applications/MEDCOUPLING-8.5.0.pyconf b/applications/MEDCOUPLING-8.5.0.pyconf
index a7b7e2a9c72cc5235d5381aa2b5e09ad1b4d1a00..44c2a452dd62a7a10d1cb26b694cce4fa2c20b36 100644 (file)
--- a/applications/MEDCOUPLING-8.5.0.pyconf
+++ b/applications/MEDCOUPLING-8.5.0.pyconf
@@ -30,44 +30,28 @@ APPLICATION :
         metis : '5.1.0'
         numpy : '1.12.1'
         Pygments : '2.0.2'
-        Python : '2.7.10'
+        Python : '2.7.16'
         pytz : '2015.4'
         scipy : '0.18.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
         six : '1.10.0'
         Sphinx : '1.2.3'
-
-        # TA 06-04-2018 Add sphinx-intl prerequisite
         sphinxintl: '0.9.10'
         swig : '2.0.12'
-        
-        
-        
-#
-        # SALOME MODULES :
-        'CONFIGURATION': {dev: 'yes'}
-        'MEDCOUPLING': {dev: 'yes'}
 
+        # SALOME MODULES :
+        'CONFIGURATION'
+        'MEDCOUPLING'
     }
     test_base : 
     {
         name : "SALOME"
         tag : "SalomeV8"
     }
+    properties :
+    {
+        repo_dev : "yes"
+        single_install_dir : "no"
+    }
 }
-
-__overwrite__ :
-[
-   {
-       # OP 09/04/2018 add sphinx-intl, six prerequisites
-    'PRODUCTS.MEDCOUPLING.default.depend' : 
-     [
-         "Babel", "boost", "click", "cmake", "cppunit", "Cython", "docutils",
-         "doxygen", "graphviz", "hdf5", "Jinja2", "lapack", "libxml2",
-         "markupsafe", "medfile", "metis", "numpy", "Pygments", "Python", "pytz",
-         "scipy", "scotch", "setuptools", "six", "Sphinx", "sphinxintl",
-         "swig", "CONFIGURATION"
-     ]
-   }
-]

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index 26d95d2dd05a89edbb66a2b13c724a6530ad45f4..e498396d05924e2f36a83c4c84e7c9885b808c30 100644 (file)
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -136,6 +136,39 @@ version_V9_3_0_win :
     cmake_options : ' -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF '
 }
 
+version_8_5_0 :
+{
+    depend : ["Babel",
+             "boost",
+             "click",
+             "cmake",
+             "cppunit",
+             "Cython",
+             "docutils",
+              "doxygen",
+             "graphviz",
+             "hdf5",
+             "Jinja2",
+             "lapack",
+             "libxml2",
+              "markupsafe",
+             "medfile",
+             "metis",
+             "numpy",
+             "Pygments",
+             "Python",
+             "pytz",
+              "scipy",
+             "scotch",
+             "setuptools",
+             "six",
+             "Sphinx",
+             "sphinxintl",
+              "swig",
+             "CONFIGURATION"
+            ]
+}
+
 version_7_8_2_to_8_4_0 :
 {
     cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF"