diff --git a/cfg/blueberry/scilab.profile b/cfg/blueberry/scilab.profile
new file mode 100644
index 0000000000000000000000000000000000000000..72c51052e8b19230c202e95c2afe96fa167d1f32
--- /dev/null
+++ b/cfg/blueberry/scilab.profile
@@ -0,0 +1 @@
+add2env PATH "/opt/scilab/bin" front
diff --git a/cfg/spirou/cmake.profile b/cfg/maclam/cmake.profile
similarity index 100%
rename from cfg/spirou/cmake.profile
rename to cfg/maclam/cmake.profile
diff --git a/cfg/spirou/eigen.profile b/cfg/maclam/eigen.profile
similarity index 100%
rename from cfg/spirou/eigen.profile
rename to cfg/maclam/eigen.profile
diff --git a/cfg/spirou/gmsh.profile b/cfg/maclam/gmsh.profile
similarity index 100%
rename from cfg/spirou/gmsh.profile
rename to cfg/maclam/gmsh.profile
diff --git a/cfg/spirou/intel.profile b/cfg/maclam/intel.profile
similarity index 100%
rename from cfg/spirou/intel.profile
rename to cfg/maclam/intel.profile
diff --git a/cfg/spirou/lagamine.profile b/cfg/maclam/lagamine.profile
similarity index 100%
rename from cfg/spirou/lagamine.profile
rename to cfg/maclam/lagamine.profile
diff --git a/cfg/spirou/matlab.bashrc b/cfg/maclam/matlab.bashrc
similarity index 100%
rename from cfg/spirou/matlab.bashrc
rename to cfg/maclam/matlab.bashrc
diff --git a/cfg/spirou/mumps.profile b/cfg/maclam/mumps.profile
similarity index 100%
rename from cfg/spirou/mumps.profile
rename to cfg/maclam/mumps.profile
diff --git a/cfg/spirou/parasolid.profile b/cfg/maclam/parasolid.profile
similarity index 100%
rename from cfg/spirou/parasolid.profile
rename to cfg/maclam/parasolid.profile
diff --git a/cfg/spirou/paraview.bashrc b/cfg/maclam/paraview.bashrc
similarity index 100%
rename from cfg/spirou/paraview.bashrc
rename to cfg/maclam/paraview.bashrc
diff --git a/cfg/spirou/prompt.bashrc b/cfg/maclam/prompt.bashrc
similarity index 100%
rename from cfg/spirou/prompt.bashrc
rename to cfg/maclam/prompt.bashrc
diff --git a/cfg/maclam/qt.profile b/cfg/maclam/qt.profile
new file mode 100644
index 0000000000000000000000000000000000000000..8b3bee070a5519d27f46ccc2c1b36f7e03ff6d3b
--- /dev/null
+++ b/cfg/maclam/qt.profile
@@ -0,0 +1,2 @@
+add2env PATH "/opt/Qt/bin"
+add2env DYLD_LIBRARY_PATH "/usr/Qt/lib"
diff --git a/cfg/spirou/vscode.bashrc b/cfg/maclam/vscode.bashrc
similarity index 100%
rename from cfg/spirou/vscode.bashrc
rename to cfg/maclam/vscode.bashrc
diff --git a/cfg/maclam/vtk.profile b/cfg/maclam/vtk.profile
new file mode 100644
index 0000000000000000000000000000000000000000..a8f5a46fd49109cb2be48240e666b934ecb34230
--- /dev/null
+++ b/cfg/maclam/vtk.profile
@@ -0,0 +1,3 @@
+add2env PYTHONPATH "/opt/VTK/lib/python3.7/site-packages"
+add2env DYLD_LIBRARY_PATH "/opt/VTK/lib"
+add2env PATH "/opt/VTK/bin"
diff --git a/cfg/spirou/compilers.bashrc b/cfg/spirou/compilers.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..9655075107eac4c2acf3bdd2e939f0917a6b04bf
--- /dev/null
+++ b/cfg/spirou/compilers.bashrc
@@ -0,0 +1,25 @@
+# Intel compiler and/or TBB/MKL
+#
+# EXPLANATIONS [RB]:
+# In practise, the call to "compilervars.sh" or ("mklvars.sh", etc) sets PATH, LD_LIBRARY_PATH.
+# If we want these variables to be set system-wide, it should be run in .profile
+#
+# BUT
+# 1. the gnome display manager unset LD_LIBRARY_PATH
+#
+# 2. if the login shell is "dash", the script cannot be called
+# (we cannot add an extra argument to a sourced script with dash).
+# THEN
+# => we call the scripts in both places (.bashrc & .profile)
+# => the env is cleaned in "loop.sh", removing duplicates if the .profile was actually read by bash
+#
+# SPECIAL CASE: "at" job
+# => the environment is OK and kept, but "LD_LIBRARY_PATH" is set to nothing by "at"
+# => the .profile is then rerun manually in our scripts (with bash)
+# should we run also .bashrc as LD_LIBRARY_PATH should be set here on systems with gnome?
+# => duplicates are finally removed by loop.sh
+
+if [ -d /opt/intel ] ; then
+ . /opt/intel/mkl/bin/mklvars.sh intel64
+ . /opt/intel/tbb/bin/tbbvars.sh intel64
+fi
diff --git a/cfg/spirou/compilers.profile b/cfg/spirou/compilers.profile
new file mode 100644
index 0000000000000000000000000000000000000000..47e39800223c0e0c05d8d2bfc5ccd3056985944c
--- /dev/null
+++ b/cfg/spirou/compilers.profile
@@ -0,0 +1,27 @@
+# Intel compiler and/or TBB/MKL
+#
+# EXPLANATIONS [RB]:
+# In practise, the call to "compilervars.sh" or ("mklvars.sh", etc) sets PATH, LD_LIBRARY_PATH.
+# If we want these variables to be set system-wide, it should be run in .profile
+#
+# BUT
+# 1. the gnome display manager unset LD_LIBRARY_PATH
+#
+# 2. if the login shell is "dash", the script cannot be called
+# (we cannot add an extra argument to a sourced script with dash).
+# THEN
+# => we call the scripts in both places (.bashrc & .profile)
+# => the env is cleaned in "loop.sh", removing duplicates if the .profile was actually read by bash
+#
+# SPECIAL CASE: "at" job
+# => the environment is OK and kept, but "LD_LIBRARY_PATH" is set to nothing by "at"
+# => the .profile is then rerun manually in our scripts (with bash)
+# should we run also .bashrc as LD_LIBRARY_PATH should be set here on systems with gnome?
+# => duplicates are finally removed by loop.sh
+
+if [ -n "$BASH_VERSION" ]; then
+ if [ -d /opt/intel ] ; then
+ . /opt/intel/mkl/bin/mklvars.sh intel64
+ . /opt/intel/tbb/bin/tbbvars.sh intel64
+ fi
+fi
diff --git a/cfg/spirou/misc.bashrc b/cfg/spirou/misc.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..d3fa8f40d87fa6473db96d08edcb9a179181679f
--- /dev/null
+++ b/cfg/spirou/misc.bashrc
@@ -0,0 +1,3 @@
+alias a2ps='a2ps --pro=color --line-numbers=5 --medium=A4'
+alias plotdigitizer='java -Xmx256m -jar /opt/PlotDigitizer/PlotDigitizer.jar'
+alias open='xdg-open'
diff --git a/cfg/spirou/qt.profile b/cfg/spirou/qt.profile
deleted file mode 100644
index 59d39de6d4b5b608ed3dd27c56b6057000ea02bf..0000000000000000000000000000000000000000
--- a/cfg/spirou/qt.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-add2env PATH "/usr/local/qt-5.8.0/bin"
-add2env DYLD_LIBRARY_PATH "/usr/local/qt-5.8.0/lib"
diff --git a/cfg/spirou/vtk.profile b/cfg/spirou/vtk.profile
deleted file mode 100644
index 2718ac59081b7c084806eb929818680beb1de663..0000000000000000000000000000000000000000
--- a/cfg/spirou/vtk.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-add2env PYTHONPATH "/usr/local/vtk-7.1.0/lib/python2.7/site-packages"
-add2env DYLD_LIBRARY_PATH "/usr/local/vtk-7.1.0/lib"
diff --git a/cfg/spring/scilab.profile b/cfg/spring/scilab.profile
new file mode 100644
index 0000000000000000000000000000000000000000..72c51052e8b19230c202e95c2afe96fa167d1f32
--- /dev/null
+++ b/cfg/spring/scilab.profile
@@ -0,0 +1 @@
+add2env PATH "/opt/scilab/bin" front
diff --git a/cfg/thorgal/scilab.profile b/cfg/thorgal/scilab.profile
new file mode 100644
index 0000000000000000000000000000000000000000..72c51052e8b19230c202e95c2afe96fa167d1f32
--- /dev/null
+++ b/cfg/thorgal/scilab.profile
@@ -0,0 +1 @@
+add2env PATH "/opt/scilab/bin" front
diff --git a/cfg/warson/scilab.profile b/cfg/warson/scilab.profile
new file mode 100644
index 0000000000000000000000000000000000000000..72c51052e8b19230c202e95c2afe96fa167d1f32
--- /dev/null
+++ b/cfg/warson/scilab.profile
@@ -0,0 +1 @@
+add2env PATH "/opt/scilab/bin" front
diff --git a/cleanLocalHdd.py b/cleanLocalHdd.py
index 89180ae6089cb7e3aa1ac49beb6912f64e155689..33a8513546fa85b455c45689577230020eb4647f 100755
--- a/cleanLocalHdd.py
+++ b/cleanLocalHdd.py
@@ -4,9 +4,6 @@
# Script cleanLocalHdd.py : listing de l'utilisation et nettoyage des disques locaux sur le cluster
#
-from __future__ import print_function
-from builtins import input
-from builtins import range
import os, sys, subprocess
def listByUser(user, nodesList):
diff --git a/comp.py b/comp.py
index 36d881fcc7d5ccaae5fd2f16acfb41693b65df67..a3a1f8c158b3219e0fef4cbfd387074a374f867c 100755
--- a/comp.py
+++ b/comp.py
@@ -5,8 +5,6 @@
# - compilation de Metafor
# - lancement automatique de la batterie
-from __future__ import print_function
-from builtins import object
from parametricJob import *
import re
@@ -209,7 +207,7 @@ class CompJob(ParametricJob):
# which python?
out = subprocess.check_output([self.pars['PYTHONEXE'].val, '-c',
- 'from __future__ import print_function; import sys; print(sys.version_info.major)'])
+ 'import sys; print(sys.version_info.major)'])
try:
pyver = int(out)
except:
diff --git a/externalProgramPath.py b/externalProgramPath.py
index 1bed7a5b2a4cd168f714857690f8ab398815e34b..d31dc0c3543bce5abf8490c51ff46f5ff6b5b36a 100755
--- a/externalProgramPath.py
+++ b/externalProgramPath.py
@@ -3,7 +3,6 @@
#
# Define external program paths according to local configuration
-from __future__ import print_function
from prmClasses import *
import os, os.path, distutils.spawn
diff --git a/externalProgramPathGui.pyw b/externalProgramPathGui.pyw
index 39987f0fce3724e29f1c1ab81d85db7bd206ba7d..9f35f5633301f9e36c3096eb27e86e52f70fdee8 100755
--- a/externalProgramPathGui.pyw
+++ b/externalProgramPathGui.pyw
@@ -4,7 +4,6 @@
# Gui to configure externals program path according to local configuration
## Qt ##
-from __future__ import print_function
try:
from PySide2.QtCore import *
from PySide2.QtGui import *
@@ -166,7 +165,8 @@ class ExtProgsConfGui(QWidget):
print("Quit pressed")
sys.exit()
-
+ def flush(self):
+ pass
# ============== Main ========================
def main():
diff --git a/launch.py b/launch.py
index 88a5329925f3936494ca7fde9781051f0271c40c..b73e5aa02193a4289e0cfe1d9ea7835fd6ed2917 100755
--- a/launch.py
+++ b/launch.py
@@ -3,7 +3,6 @@
#
# Script "launch.py": aide au lancement d'un job Metafor
-from __future__ import print_function
import sys, os, os.path, subprocess
import shutil, socket, platform, glob, fnmatch, re
import datetime, tarfile, signal
diff --git a/launchGui.pyw b/launchGui.pyw
index ba2e9f7e5adfb7dacec4bb888c560ec4aecf8176..2af43e93caee3420fe64323adc927ec53d5c8ce0 100755
--- a/launchGui.pyw
+++ b/launchGui.pyw
@@ -11,9 +11,6 @@
# unicodestr.encode('ascii','ignore')
#
-from __future__ import print_function
-from builtins import map
-from builtins import str
import os,sys
from prmClassesGui import *
from launch import *
@@ -369,7 +366,9 @@ class LaunchGui(QWidget):
if stuff != '':
self.console.append(stuff)
-
+ def flush(self):
+ pass
+#====================================================================================
def main():
#define launcher
launch = LaunchJob()
diff --git a/parametricJob.py b/parametricJob.py
index 4dfc0a9eeb7c61f85e451fdc67f1dad0b0fee0ed..9ebb8b7ca1451af9044b719095867ad212115251 100644
--- a/parametricJob.py
+++ b/parametricJob.py
@@ -1,10 +1,8 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from __future__ import print_function
from future import standard_library
standard_library.install_aliases()
-from builtins import input
import sys, os, os.path, shutil, socket, platform, glob, fnmatch
import datetime, tarfile, subprocess, string
from prmClasses import *
diff --git a/postProLoop.py b/postProLoop.py
index 9b9017ec097f7d1b0b9f528f0b59b8ac013b2fa7..254cec189ae8db3039063d4549339aa512a2a701 100755
--- a/postProLoop.py
+++ b/postProLoop.py
@@ -5,7 +5,6 @@
#
# Define externals program path according to local configuration
#
-from __future__ import print_function
from prmClasses import *
import os, os.path, distutils.spawn, time, sys, re, glob
import imp
diff --git a/postProLoopGui.pyw b/postProLoopGui.pyw
index 536d62d8fd869aa02bdb9148b509daa7ace9a619..a79597a75f4edbbd7df348c649682430450f21c2 100755
--- a/postProLoopGui.pyw
+++ b/postProLoopGui.pyw
@@ -7,7 +7,6 @@
#
## Qt ##
-from __future__ import print_function
try:
from PySide2.QtCore import *
from PySide2.QtGui import *
@@ -204,6 +203,8 @@ class PostProLoopGui(QWidget):
print("Quit pressed")
sys.exit()
+ def flush(self):
+ pass
# ============== Main ========================
def main():
# create gui
diff --git a/prmClasses.py b/prmClasses.py
index 65b950b36462440632a1167ff4d55eadf493848b..46fc38e1598becc03c23c49660da883f0505a901 100644
--- a/prmClasses.py
+++ b/prmClasses.py
@@ -4,9 +4,6 @@
# Classes de gestion des parametres
-from __future__ import print_function
-from builtins import input
-from builtins import object
import sys, os, os.path, shutil, socket, platform, glob, fnmatch
import datetime, tarfile, subprocess
diff --git a/prmClassesGui.py b/prmClassesGui.py
index 770a2351fda2fe54bc5616070c41d1faf705ab57..3b20bd27509777a2e67127db1ece181439c78ebf 100644
--- a/prmClassesGui.py
+++ b/prmClassesGui.py
@@ -5,8 +5,6 @@
#
# Classe d'interface PyQt des prmClasses
-from __future__ import print_function
-from builtins import object
import os,sys
## Qt ##
diff --git a/updatebin.sh b/updatebin.sh
index 95699054e6faac1d191c5e68d1ba209ded0fd9a3..7912827c733c6faedb699e9d0f70aa4561eccb71 100755
--- a/updatebin.sh
+++ b/updatebin.sh
@@ -13,5 +13,6 @@ echo "===== updating gaston..."
ssh gaston 'cd ~/bin ; git pull'
echo "===== updating warson..."
ssh warson 'cd ~/bin ; git pull'
+echo "===== updating spirou..."
+ssh spirou 'cd ~/bin ; git pull'
echo "===== done."
-
diff --git a/vim/.vimrc b/vim/.vimrc
index 22fe6d636dddb8701ff5764b65d5946a041afa17..d13f740f164835760f8f840f1210e5ffe6f351f9 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -79,7 +79,7 @@ set shiftwidth=4 " indent using '>' uses 4 spaces
set softtabstop=4
set expandtab " tabs => spaces
set smartindent
-set number " line numbers (set nu)
+"set number " line numbers (set nu)
set nowrap " no wrapping of long lines
set noswapfile