Merge pull request #48 from tadkollar/mumpsfix

Uses newer conda packages for MUMPS and fixed the MacOS test workflow

Author: tadkollar

.github/workflows/test_workflow.yml

@@ -28,15 +28,16 @@ jobs:
             PAROPT: true
             SNOPT: 7.7
 
-          # # test baseline versions on MacOS
-          # - NAME: MacOS Baseline
-          #   OS: macos-latest
-          #   PY: '3.10'
-          #   NUMPY: 1.22
-          #   SCIPY: 1.7
-          #   PYOPTSPARSE: 'v2.8.3'
-          #   PAROPT: true
-          #   SNOPT: 7.7
+          # test baseline versions on MacOS
+          - NAME: MacOS Baseline
+            OS: macos-latest
+            PY: '3.11'
+            NUMPY: 1
+            SCIPY: 1
+            MPI4PY: true
+            PYOPTSPARSE: 'latest'
+            PAROPT: true
+            SNOPT: 7.7
 
           # test latest versions
           - NAME: Ubuntu Latest
@@ -192,15 +193,17 @@ jobs:
 
           build_pyoptsparse -v $BRANCH $PAROPT $SNOPT $NO_IPOPT $LINEAR_SOLVER
 
-          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+          echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
 
       - name: Run tests
         run: |
           python -m pip install testflo parameterized six
+          conda install -y -q gettext
 
           echo "============================================================="
           echo "Run tests from pyoptsparse repository"
           echo "============================================================="
+          unset DYLD_LIBRARY_PATH
           git clone $BRANCH https://github.com/mdolab/pyoptsparse
           cd pyoptsparse/test*/
           testflo --pre_announce --show_skipped .

__init__.py

@@ -1 +1 @@
-__version__ = '2.0.4'
+__version__ = '2.0.5'

build_pyoptsparse.py

@@ -762,7 +762,9 @@ def install_mumps():
     """ Install MUMPS either through conda or building. """
     if allow_install_with_conda() and opts['force_build'] is False:
         try:
-            install_conda_pkg('mumps')
+            install_conda_pkg('mumps-include')
+            install_conda_pkg('mumps-seq')
+            install_conda_pkg('mumps-mpi')
             return
         except Exception as e:
             try_fallback('MUMPS', e)
@@ -1009,7 +1011,7 @@ def uninstall_conda_pkgs():
     """ Attempt to remove packages previously installed by conda. """
 
     if conda_is_active():
-        for pkg in ['ipopt','mumps','metis']:
+        for pkg in ['ipopt','mumps','mumps-include','mumps-seq','mumps-mpi','metis']:
             note(f"Removing {pkg.upper()} conda package")
             run_cmd(cmd_list=[opts['conda_cmd'],'uninstall','-y',pkg], do_check=False)
             note_ok()