From 0c091338a313d29a70fc2530ba60fd5bdb7dfe49 Mon Sep 17 00:00:00 2001
From: Andrew Simms <andrew.simms@nrel.gov>
Date: Mon, 9 Dec 2024 13:12:33 -0700
Subject: [PATCH] Actions: Install mhkit-python via conda-forge

---
 .github/workflows/unix_unit_tests.yml    | 39 ++++++++++++------------
 .github/workflows/windows_unit_tests.yml | 34 ++++++++++-----------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/unix_unit_tests.yml b/.github/workflows/unix_unit_tests.yml
index c1978114..f52a96d2 100644
--- a/.github/workflows/unix_unit_tests.yml
+++ b/.github/workflows/unix_unit_tests.yml
@@ -35,7 +35,7 @@ jobs:
         shell: bash -l {0}
         run: |
           conda activate mhkit_conda_env
-          conda install numpy==1.24.4 cython pip pytest hdf5 libnetcdf cftime netcdf4
+          conda install mhkit
           # conda install netcdf4 hdf5
           # export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH" # so setup.py finds nc-config
 
@@ -55,11 +55,11 @@ jobs:
       #     pip install -e .
       #   working-directory: ${{env.mhkit-python-dir}}
 
-      - name: pip install mhkit from pypi
-        shell: bash -l {0}
-        run: |
-          conda activate mhkit_conda_env
-          pip install mhkit==$MHKIT_PYTHON_VERSION
+      # - name: pip install mhkit from pypi
+      #   shell: bash -l {0}
+      #   run: |
+      #     conda activate mhkit_conda_env
+      #     pip install mhkit==$MHKIT_PYTHON_VERSION
 
       - name: pip install mhkit-python-utils module from source
         shell: bash -l {0}
@@ -67,12 +67,12 @@ jobs:
           conda activate mhkit_conda_env
           pip install -e .
 
-      - name: Pin scipy version
-        shell: bash -l {0}
-        run: |
-          conda activate mhkit_conda_env
-          pip uninstall -y scipy
-          pip install scipy==1.10.1
+      # - name: Pin scipy version
+      #   shell: bash -l {0}
+      #   run: |
+      #     conda activate mhkit_conda_env
+      #     pip uninstall -y scipy
+      #     pip install scipy==1.10.1
 
       - name: List installed pip modules
         shell: bash -l {0}
@@ -224,7 +224,8 @@ jobs:
         shell: bash -l {0}
         run: |
           conda activate mhkit_conda_env
-          conda install numpy==1.24.4 cython pip pytest hdf5 libnetcdf cftime netcdf4
+          conda install mhkit
+          # conda install numpy==1.24.4 cython pip pytest hdf5 libnetcdf cftime netcdf4
           # conda install netcdf4 hdf5
           # export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH" # so setup.py finds nc-config
 
@@ -305,12 +306,12 @@ jobs:
           conda activate mhkit_conda_env
           pip install -e .
 
-      - name: Pin scipy version
-        shell: bash -l {0}
-        run: |
-          conda activate mhkit_conda_env
-          pip uninstall -y scipy
-          pip install scipy==1.10.1
+      # - name: Pin scipy version
+      #   shell: bash -l {0}
+      #   run: |
+      #     conda activate mhkit_conda_env
+      #     pip uninstall -y scipy
+      #     pip install scipy==1.10.1
 
       - name: List installed pip modules
         shell: bash -l {0}
diff --git a/.github/workflows/windows_unit_tests.yml b/.github/workflows/windows_unit_tests.yml
index d99222e9..103c1857 100644
--- a/.github/workflows/windows_unit_tests.yml
+++ b/.github/workflows/windows_unit_tests.yml
@@ -30,10 +30,10 @@ jobs:
           channels: conda-forge
 
       # This is necessary to fix any issues with netcdf4 and hdf5 headers
-      - name: "Conda install netcdf4, hdf5"
+      - name: Conda install mhkit
         run: |
           conda activate mhkit_conda_env
-          conda install numpy==1.24.4 netcdf4 hdf5
+          conda mhkit
       - name: Check out MHKiT-MATLAB
         uses: actions/checkout@v4
 
@@ -60,12 +60,12 @@ jobs:
           conda activate mhkit_conda_env
           pip install -e .
 
-      - name: Pin scipy version
-        shell: bash -l {0}
-        run: |
-          conda activate mhkit_conda_env
-          pip uninstall -y scipy
-          pip install scipy==1.10.1
+      # - name: Pin scipy version
+      #   shell: bash -l {0}
+      #   run: |
+      #     conda activate mhkit_conda_env
+      #     pip uninstall -y scipy
+      #     pip install scipy==1.10.1
 
       # Create the cache and add a dummy file
       # The dummy file ensures that the artifact download
@@ -176,11 +176,11 @@ jobs:
           channels: conda-forge
 
       # This is necessary to fix any issues with netcdf4 and hdf5 headers
-      - name: "Conda install netcdf4, hdf5"
+      - name: Conda install mhkit
         shell: bash -l {0}
         run: |
           conda activate mhkit_conda_env
-          conda install numpy==1.24.4 netcdf4 hdf5
+          conda install mhkit
       - name: Output python executable
         shell: bash -l {0}
         run: |
@@ -217,13 +217,13 @@ jobs:
           conda activate mhkit_conda_env
           pip3 install -e .
 
-      - name: Pin scipy version
-        shell: bash -l {0}
-        run: |
-          conda activate mhkit_conda_env
-          pip uninstall -y scipy
-          pip install scipy==1.10.1
-
+      # - name: Pin scipy version
+      #   shell: bash -l {0}
+      #   run: |
+      #     conda activate mhkit_conda_env
+      #     pip uninstall -y scipy
+      #     pip install scipy==1.10.1
+      #
       - name: List installed pip modules
         shell: bash -l {0}
         run: |