Merge pull request #177 from vincentcasseau/main

PyPI - Github Actions: adding prodmode 2 for install on azure
onera · Sep 11, 2024 · f4b3e24 · f4b3e24
2 parents 8f5bf5e + a87268c
commit f4b3e24
Show file tree

Hide file tree

Showing 22 changed files with 124 additions and 230 deletions.
diff --git a/Cassiopee/Apps/install b/Cassiopee/Apps/install
@@ -23,33 +23,29 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
 
 # Compilation et installation
-if [ $PRODMODE -eq 0 ]; then
+if [ $PRODMODE -eq 0 ]; then # setup
     python setup.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
-elif [ $PRODMODE -eq 1 ]; then
+elif [ $PRODMODE -eq 1 ]; then # pip
+    python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+    [ $? != 0 ] && exit 1;
+elif [ $PRODMODE -eq 2 ]; then # pip+wheel
+    # wheels in $INSTALLPATH
     TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Check installation
 python test/t1.py
diff --git a/Cassiopee/CPlot/install b/Cassiopee/CPlot/install
@@ -23,16 +23,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -60,11 +57,13 @@ if [ $PRODMODE -le 1 ]; then
     rm -f build/lib.*/CPlot/cplot-*.*
     rm -f build/lib.*/CPlot/cplotOSMesa.*
     rm -f build/lib.*/CPlot/cplotOSMesa-*.*
-
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -73,11 +72,6 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 cp test/cplot "$INSTALLPATH"
 cp test/cplot.py "$INSTALLPATH"
 # Copie les applications

diff --git a/Cassiopee/Compressor/install b/Cassiopee/Compressor/install
@@ -22,16 +22,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -63,7 +60,10 @@ if [ $PRODMODE -le 1 ]; then
     if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then # pip+wheel
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -72,10 +72,5 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Connector/install b/Cassiopee/Connector/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,23 +58,21 @@ if [ $PRODMODE -le 1 ]; then
     #touch Connector/connector.cpp
     rm -f build/lib.*/Connector/connector.*
     rm -f build/lib.*/Connector/connector-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then # pip+wheel
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1; 
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Install libconnector
 python installLib.py
 

diff --git a/Cassiopee/Converter/install b/Cassiopee/Converter/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,10 +58,13 @@ if [ $PRODMODE -le 1 ]; then
     rm -f build/lib.*/Converter/converter.*
     rm -f build/lib.*/Converter/converter-*.*
     rm -f build/lib.*/Converter/expression.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -73,11 +73,6 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 cp test/ediff "$INSTALLPATH"
 cp test/ediff.py "$INSTALLPATH"
 cp Converter/kpython "$INSTALLPATH"

diff --git a/Cassiopee/Dist2Walls/install b/Cassiopee/Dist2Walls/install
@@ -23,16 +23,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -58,10 +55,13 @@ if [ $PRODMODE -le 1 ]; then
     #touch Dist2Walls/dist2walls.cpp
     rm -f build/lib.*/Dist2Walls/dist2walls.*
     rm -f build/lib.*/Dist2Walls/dist2walls-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -70,10 +70,5 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Distributor2/install b/Cassiopee/Distributor2/install
@@ -26,16 +26,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,10 +58,13 @@ if [ $PRODMODE -le 2 ]; then
     #touch Distributor2/distributor2.cpp
     rm -f build/lib.*/Distributor2/distributor2.*
     rm -f build/lib.*/Distributor2/distributor2-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -73,10 +73,5 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test installation
 python test/t1.py
diff --git a/Cassiopee/Envs/env_Cassiopee_local b/Cassiopee/Envs/env_Cassiopee_local
@@ -70,7 +70,6 @@ else
 endif
 set EXT=$INTTYPE$DBGMODE
 
-set CLEAN_WHEELS_CASSIOPEE=1
 
 # ----------------------------- Prods ------------------------------------------
 

diff --git a/Cassiopee/Envs/sh_Cassiopee_local b/Cassiopee/Envs/sh_Cassiopee_local
@@ -76,7 +76,6 @@ case $MACHINETMP in
 esac
 unset MACHINETMP
 EXT=$INTTYPE$DBGMODE
-export CLEAN_WHEELS_CASSIOPEE=1
 
 # ----------------------------- Prods ------------------------------------------
 if [ "$MAC" = "ld_eos8" ]; then
@@ -165,9 +164,8 @@ elif [ "$MAC" = "azure" ]; then
     export ELSAPROD=$ELSAPROD$EXT
     export OMP_NUM_THREADS=4
     export PYTHONEXE=python3
-    export PRODMODE=1
+    export PRODMODE=2
     export PIP_DISABLE_PIP_VERSION_CHECK=1
-    export CLEAN_WHEELS_CASSIOPEE=0
 
 elif [ "$MAC" = "visio" ]; then
 #----------------------------- visio -----------------------------------------

diff --git a/Cassiopee/Generator/install b/Cassiopee/Generator/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -60,23 +57,21 @@ if [ $PRODMODE -le 1 ]; then
     #touch Generator/generator.cpp
     rm -f build/lib.*/Generator/generator.*
     rm -f build/lib.*/Generator/generator-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Install libgenerator
 python installLib.py