remplacement python2.7 en dur dans des chemins

diff --git a/src/HYDROGUI/BndConditionsDialog.py b/src/HYDROGUI/BndConditionsDialog.py
index e86b16cef973c7ba5cdb6e2c6273ae096b574585..474b4be4f3ae3bb33ba13868d161f3fee4b72720 100755 (executable)
--- a/src/HYDROGUI/BndConditionsDialog.py
+++ b/src/HYDROGUI/BndConditionsDialog.py
@@ -26,8 +26,9 @@ from PyQt5 import uic
 from MEDLoader import MEDFileMesh
 
 # TODO: get rid of sys.path.append() ?
-hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome')
-#sys.path.append(os.path.join(hydro_solver_root, 'salome', 'hydrotools'))
+import sysconfig
+pythonVersion = 'python' + sysconfig.get_python_version()
+hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome')
 
 from salome.hydro import boundaryConditions
 
@@ -127,7 +128,7 @@ class BoundaryConditionsDialog(QDialog):
     """Initialize presets"""
     def init_presets(self):
         # TODO: determine another presets path
-        presets_data_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome', 'tests', 'data')
+        presets_data_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome', 'tests', 'data')
         file_path = os.path.join(presets_data_root, 'bnd_conditions_presets.txt')
         reader = boundaryConditions.PresetReader(file_path)
         self.presets = reader.read()

diff --git a/src/HYDROGUI/BreachesDialog.py b/src/HYDROGUI/BreachesDialog.py
index a2cf61cbae3e48e051ac2873e434cdca081f0172..bedc6e19e5eece56d953f5d271afdc40b273ac3b 100644 (file)
--- a/src/HYDROGUI/BreachesDialog.py
+++ b/src/HYDROGUI/BreachesDialog.py
@@ -3,7 +3,9 @@
 import sys, os
 import string
 
-#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome', 'salome', 'hydro')
+#import sysconfig
+#pythonVersion = 'python' + sysconfig.get_python_version()
+#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome')
 
 #import salome
 #salome.salome_init()

diff --git a/src/HYDROGUI/InitialConditionsDialog.py b/src/HYDROGUI/InitialConditionsDialog.py
index bb0be2de5d1a6a5a4218aeffd34a6474d7722cfb..d32cd41f28675c410410aa92ee1847994c167d88 100644 (file)
--- a/src/HYDROGUI/InitialConditionsDialog.py
+++ b/src/HYDROGUI/InitialConditionsDialog.py
@@ -3,7 +3,9 @@
 import sys, os
 import string
 
-#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome', 'salome', 'hydro')
+#import sysconfig
+#pythonVersion = 'python' + sysconfig.get_python_version()
+#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome')
 
 #import salome
 #salome.salome_init()

diff --git a/src/HYDROGUI/LiquidBoundariesDialog.py b/src/HYDROGUI/LiquidBoundariesDialog.py
index f860d89585930121319c701fcd7e4897dc6137c5..b10938e899f13ace2638b6d5b5acfc83c15aef1b 100644 (file)
--- a/src/HYDROGUI/LiquidBoundariesDialog.py
+++ b/src/HYDROGUI/LiquidBoundariesDialog.py
@@ -3,7 +3,9 @@
 import sys, os
 import string
 
-#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome', 'salome', 'hydro')
+#import sysconfig
+#pythonVersion = 'python' + sysconfig.get_python_version()
+#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome')
 
 #import salome
 #salome.salome_init()

diff --git a/src/salome_hydro/assignStrickler_gui.py b/src/salome_hydro/assignStrickler_gui.py
index b06343de49ccd8435d3524cf69aa19b9f4fcd5b3..82a31e2b49f61c6caf5af24df3857f10703d7f29 100644 (file)
--- a/src/salome_hydro/assignStrickler_gui.py
+++ b/src/salome_hydro/assignStrickler_gui.py
@@ -3,7 +3,9 @@
 import sys, os
 import string
 
-hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome', 'salome', 'hydro')
+import sysconfig
+pythonVersion = 'python' + sysconfig.get_python_version()
+hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome', 'salome', 'hydro')
 
 import salome
 salome.salome_init()

diff --git a/src/salome_hydro/generate_interpolz.py b/src/salome_hydro/generate_interpolz.py
index cb2f9becd45f165b42b2a7486d7e8c2ae0980637..d1b4eca9b1a140c20e0fe5bb7e984d5d2929dc91 100644 (file)
--- a/src/salome_hydro/generate_interpolz.py
+++ b/src/salome_hydro/generate_interpolz.py
@@ -1,6 +1,8 @@
 
 import os
-hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome', 'salome', 'hydro')
+import sysconfig
+pythonVersion = 'python' + sysconfig.get_python_version()
+hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome', 'salome', 'hydro')
 
 def replace( lines, pattern, subst ):
   for i in range( 0, len( lines ) ):

diff --git a/src/salome_hydro/interpolz_gui.py b/src/salome_hydro/interpolz_gui.py
index cc1156e65e8116451dc736384c69f0f5546d9286..742b2918790350a5aa70cf0558c03875cfded665 100644 (file)
--- a/src/salome_hydro/interpolz_gui.py
+++ b/src/salome_hydro/interpolz_gui.py
@@ -1,10 +1,9 @@
 
 import sys, os
 import string
-#sys.path.append(os.path.join(os.environ['MEDFILE_ROOT_DIR'], 'lib/python2.7/site-packages/med'))
-#sys.path.append(os.path.join(os.environ['MEDFICHIER_INSTALL_DIR'], 'lib/python2.7/site-packages/med'))
-hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome', 'salome', 'hydro')
-#sys.path.append(hydro_solver_root)
+import sysconfig
+pythonVersion = 'python' + sysconfig.get_python_version()
+hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome', 'salome', 'hydro')
 
 import salome
 salome.salome_init()

diff --git a/tests/boundaryConditionsDlgTest.py b/tests/boundaryConditionsDlgTest.py
index a74894d3e1d3ef5d640312db38df31ae2ed4930e..fd759e6c90fbe4f84921b219e340f40cfad9293b 100644 (file)
--- a/tests/boundaryConditionsDlgTest.py
+++ b/tests/boundaryConditionsDlgTest.py
@@ -7,8 +7,9 @@ from PyQt5.QtWidgets import *
 cur_dir = os.path.dirname(os.path.realpath(__file__))
 data_dir = os.path.join(cur_dir, "data")
 
-#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome')
-#sys.path.append(hydro_solver_root)
+#import sysconfig
+#pythonVersion = 'python' + sysconfig.get_python_version()
+#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome', 'salome', 'hydro')
 from BndConditionsDialog import BoundaryConditionsDialog
 
 # Show the dialog

diff --git a/tests/boundaryConditionsTest.py b/tests/boundaryConditionsTest.py
index 238413f48c75e0126ca58b5ea079a3c310ccfdb2..7339a1d5537a641269333f9aac05caf507a12473 100644 (file)
--- a/tests/boundaryConditionsTest.py
+++ b/tests/boundaryConditionsTest.py
@@ -8,8 +8,9 @@ import unittest
 cur_dir = os.path.dirname(os.path.realpath(__file__))
 data_dir = os.path.join(cur_dir, "data")
 
-#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'python2.7', 'site-packages', 'salome')
-#sys.path.append(hydro_solver_root)
+#import sysconfig
+#pythonVersion = 'python' + sysconfig.get_python_version()
+#hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', pythonVersion, 'site-packages', 'salome', 'salome', 'hydro')
 import boundaryConditions