Merge pull request #155 from vincentcasseau/main

PyPI: publish v2
onera · Sep 2, 2024 · da22002 · da22002
2 parents 5f67037 + f060d93
commit da22002
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Build Cassiopee package
         run: |
           export CASSIOPEE=$GITHUB_WORKSPACE
-          export MACHINE=ubuntu
+          export MACHINE=azure
           . $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
@@ -65,7 +65,9 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: find -name "*.whl" -exec twine upload {} +
+        run: |
+          find $CASSIOPEE -name "*.whl"
+#          find $CASSIOPEE -name "*.whl" -exec twine upload {} +
 
 #  publish:
 #      runs-on: ubuntu-latest

diff --git a/Cassiopee/Envs/sh_Cassiopee_local b/Cassiopee/Envs/sh_Cassiopee_local
@@ -23,7 +23,7 @@ if echo "$KC" | grep -q 'ld'; then export MAC="ld"; fi
 if echo "$KC" | grep -q 'f0'; then export MAC="juno"; fi
 if echo "$KC" | grep -q 'n0'; then export MAC="juno"; fi
 if echo "$KC" | grep -q 'v0'; then export MAC="juno"; fi
-if echo "$KC" | grep -q 'fv-az'; then export MAC="ubuntu"; fi
+if echo "$KC" | grep -q 'fv-az'; then export MAC="azure"; fi
 if echo "$KC" | grep -q 'clausius'; then export MAC="ld"; fi
 if echo "$KC" | grep -q 'ubuntu'; then export MAC="ubuntu"; fi
 if echo "$KC" | grep -q 'visio'; then export MAC="visio"; fi
@@ -156,6 +156,15 @@ elif [ "$MAC" = "ubuntu" ]; then
     export PYTHONEXE=python3
     export PRODMODE=1
     export PIP_DISABLE_PIP_VERSION_CHECK=1
+
+elif [ "$MAC" = "azure" ]; then
+#------------------------ azure: ubuntu - github actions ----------------------
+    export ELSAPROD=azure
+    export ELSAPROD=$ELSAPROD$EXT
+    export OMP_NUM_THREADS=4
+    export PYTHONEXE=python3
+    export PRODMODE=1
+    export PIP_DISABLE_PIP_VERSION_CHECK=1
 
 elif [ "$MAC" = "visio" ]; then
 #----------------------------- visio -----------------------------------------

diff --git a/Cassiopee/KCore/installBase.py b/Cassiopee/KCore/installBase.py
@@ -728,6 +728,21 @@
 [] # NvccAdditionalOptions
 ],
 ###############################################################################
+'azure': [ 'Linux ubuntu 24.04 - Github Actions',
+'gfortran', # f77compiler
+'gfortran', # f90compiler
+'gcc', # Cppcompiler
+[], # CppAdditionalOptions
+[], # f77AdditionalOptions
+True, # useOMP
+False, # static
+['/usr/include', '/usr/include/hdf5/openmpi', '/usr/lib/x86_64-linux-gnu/openmpi/include'], # additionalIncludePaths
+['gfortran', 'gomp'], # additionalLibs
+['/usr/lib/x86_64-linux-gnu/hdf5/openmpi', '/usr/lib/x86_64-linux-gnu'], # additionalLibPaths
+False, # useCuda
+[] # NvccAdditionalOptions
+],
+###############################################################################
 'linux': [ 'Linux (generic)',
 'gfortran', # f77compiler
 'gfortran', # f90compiler