Merge branch 'main' of github.com:onera/Cassiopee

onera · Sep 3, 2024 · 0872db2 · 0872db2
2 parents a085bba + b1ccc55
commit 0872db2
Show file tree

Hide file tree

Showing 24 changed files with 278 additions and 68 deletions.
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install wheel setuptools scons numpy mpi4py
+          pip install wheel twine setuptools scons numpy mpi4py
           
       - name: Verify Python and Installed Packages
         run: |
@@ -56,18 +56,17 @@ jobs:
           . $CASSIOPEE/Cassiopee/Envs/sh_Cassiopee_r8
           cd $CASSIOPEE/Cassiopee
           echo -e "FREEMODULES='KCore XCore Converter Geom Transform Generator Post Initiator Connector Distributor2 Dist2Walls RigidMotion Compressor Modeler Intersector Apps CPlot'\nexport FREEMODULES\nFULLMODULES='KCore XCore Converter Geom Transform Generator Post Initiator Connector Distributor2 Dist2Walls RigidMotion Compressor Modeler Intersector Apps CPlot'\nexport FULLMODULES\nOTHERS=''" > $CASSIOPEE/Cassiopee/MODULES
-          echo "PATH: $PATH"
-          echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-          echo "PYTHONPATH: $PYTHONPATH"
           ./install
 
       - name: Publish to PyPI
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
         run: |
-          find $CASSIOPEE -name "*.whl"
-#          find $CASSIOPEE -name "*.whl" -exec twine upload {} +
+          export CASSIOPEE=$GITHUB_WORKSPACE
+          export MACHINE=azure
+          . $CASSIOPEE/Cassiopee/Envs/sh_Cassiopee_r8
+          find $CASSIOPEE/Dist/bin/$ELSAPROD/pip-ephem-wheel-cache-* -type f -name "*.whl" -exec twine upload {} +
           
 #  publish:
 #      runs-on: ubuntu-latest

diff --git a/Cassiopee/Apps/install b/Cassiopee/Apps/install
@@ -23,6 +23,9 @@ 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
@@ -35,13 +38,18 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -eq 0 ] || [ $PRODMODE -eq 2 ]; then
+if [ $PRODMODE -eq 0 ]; then
     python setup.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 elif [ $PRODMODE -eq 1 ]; then
-    python -m pip install --ignore-installed --upgrade --prefix="$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,6 +23,9 @@ 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
@@ -62,13 +65,19 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 cp test/cplot "$INSTALLPATH"
 cp test/cplot.py "$INSTALLPATH"
 # Copie les applications

diff --git a/Cassiopee/Compressor/install b/Cassiopee/Compressor/install
@@ -22,6 +22,9 @@ 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
@@ -61,13 +64,18 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then # pip+wheel
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Connector/install b/Cassiopee/Connector/install
@@ -25,6 +25,9 @@ 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
@@ -62,14 +65,19 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then # pip+wheel
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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,6 +25,9 @@ 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
@@ -62,13 +65,19 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 cp test/ediff "$INSTALLPATH"
 cp test/ediff.py "$INSTALLPATH"
 cp Converter/kpython "$INSTALLPATH"

diff --git a/Cassiopee/Dist2Walls/install b/Cassiopee/Dist2Walls/install
@@ -23,6 +23,9 @@ 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
@@ -59,13 +62,18 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Distributor2/install b/Cassiopee/Distributor2/install
@@ -26,6 +26,9 @@ 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
@@ -62,13 +65,18 @@ if [ $PRODMODE -le 2 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 # Test installation
 python test/t1.py
diff --git a/Cassiopee/Envs/env_Cassiopee_local b/Cassiopee/Envs/env_Cassiopee_local
@@ -70,6 +70,8 @@ else
 endif
 set EXT=$INTTYPE$DBGMODE
 
+set CLEAN_WHEELS_CASSIOPEE=1
+
 # ----------------------------- Prods ------------------------------------------
 
 if ($MAC == "ld_pgi") then

diff --git a/Cassiopee/Envs/sh_Cassiopee_local b/Cassiopee/Envs/sh_Cassiopee_local
@@ -76,6 +76,7 @@ case $MACHINETMP in
 esac
 unset MACHINETMP
 EXT=$INTTYPE$DBGMODE
+export CLEAN_WHEELS_CASSIOPEE=1
 
 # ----------------------------- Prods ------------------------------------------
 if [ "$MAC" = "ld_eos8" ]; then
@@ -165,6 +166,7 @@ elif [ "$MAC" = "azure" ]; then
     export PYTHONEXE=python3
     export PRODMODE=1
     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,6 +25,9 @@ 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
@@ -61,14 +64,19 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
 

diff --git a/Cassiopee/Geom/install b/Cassiopee/Geom/install
@@ -26,6 +26,9 @@ 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
@@ -62,13 +65,18 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Initiator/install b/Cassiopee/Initiator/install
@@ -26,6 +26,9 @@ 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
@@ -62,13 +65,18 @@ if [ $PRODMODE -le 1 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
     elif [ $PRODMODE -eq 1 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 # Test installation
 python test/t1.py
diff --git a/Cassiopee/Intersector/install b/Cassiopee/Intersector/install
@@ -26,6 +26,9 @@ 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
@@ -61,14 +64,19 @@ if [ $PRODMODE -le 1 ]; then
     if [ $PRODMODE -eq 0 ]; then
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 2 ]; then
-        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+    elif [ $PRODMODE -eq 1 ]; then
+        TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 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
+
 # Test l'installation
 python test/t1.py