Merge branch 'smdogroup:master' into aero-shape

Author: bburke38

.github/workflows/deploy_conda_package.yml

@@ -92,8 +92,14 @@ jobs:
           export F2F_DIR=${GITHUB_WORKSPACE};
           echo "F2F_DIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV;
           export ANACONDA_API_TOKEN=${{ secrets.ANACONDA_TOKEN }};
+          export BUILD_ARGS="--no-include-recipe ${{ matrix.EXTRA_ARGS }}";
+          if [[ ${{ matrix.SCALAR }} == "complex" ]]; then
+            export LABEL="complex"
+          elif [[ ${{ matrix.SCALAR }} == "real" ]]; then
+            export LABEL="main"
+          fi
           conda install anaconda-client conda-build conda-verify -q -y;
           conda config --set anaconda_upload no;
           cd ${F2F_DIR}/conda;
-          conda build --variants "{scalar: ${{ matrix.SCALAR }}}" -c conda-forge -c "smdogroup/label/complex" -c smdogroup --output-folder . .;
+          conda build --variants "{scalar: ${{ matrix.SCALAR }}}" -c "smdogroup/label/complex" -c smdogroup -c conda-forge $BUILD_ARGS --output-folder . .;
           anaconda upload --label $LABEL ${{ matrix.TARGET }}/*.tar.bz2 --force;

conda/build.sh

@@ -33,4 +33,4 @@ mkdir ${PREFIX}/include/funtofem
 cp ${F2F_DIR}/include/*.h ${PREFIX}/include/funtofem
 
 # make the python package
-CFLAGS=${PIP_FLAGS} ${PYTHON} -m pip install --no-deps --prefix=${PREFIX} . -vv;
+CPPFLAGS=${PIP_FLAGS} ${PYTHON} -m pip install --no-deps --prefix=${PREFIX} . -vv;

conda/meta.yaml

@@ -43,7 +43,7 @@ requirements:
     - mpich  # [mpi == "mpich" and build_platform != target_platform]
     - openmpi-mpicxx  # [mpi == "openmpi" and build_platform != target_platform]
     - mpich-mpicxx  # [mpi == "mpich" and build_platform != target_platform]
-    - mpi4py >=3.1.1 # [build_platform != target_platform]
+    - mpi4py >=3.1.5,<4.0.0 # [build_platform != target_platform]
     - cython >=0.29,<3.0 # [build_platform != target_platform]
     - setuptools # [build_platform != target_platform]
     - tacs >=3.4.0 # [build_platform != target_platform]
@@ -56,7 +56,7 @@ requirements:
     - mpich  # [mpi == "mpich"]
     - libopenblas
     - lapack
-    - mpi4py >=3.1.1
+    - mpi4py >=3.1.5,<4.0.0
     - cython >=0.29,<3.0
     - tacs >=3.4.0
 
@@ -68,7 +68,7 @@ requirements:
     - mpich  # [mpi == "mpich"]
     - libopenblas
     - lapack
-    - mpi4py >=3.1.1
+    - mpi4py >=3.1.5,<4.0.0
     - tacs >=3.4.0
 
 test: