Add otps as a dependency

MPAS-Dev · Nov 28, 2022 · dd8a8c4 · dd8a8c4
1 parent e8ce7a5
commit dd8a8c4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/conda/bootstrap.py b/conda/bootstrap.py
@@ -248,11 +248,7 @@ def build_conda_env(env_type, recreate, machine, mpi, conda_mpi, version,
     if env_type == 'test_release':
         # for a test release, we will be the compass package from the dev label
         channels = channels + ['-c e3sm/label/compass_dev']
-    if (machine is not None and machine.startswith('conda')) \
-            or env_type == 'release':
-        # we need libpnetcdf and scorpio (and maybe compass itself) from the
-        # e3sm channel, compass label
-        channels = channels + ['-c e3sm/label/compass']
+    channels = channels + ['-c e3sm/label/compass']
 
     channels = f'--override-channels {" ".join(channels)}'
     packages = f'python={python}'

diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template
@@ -22,6 +22,7 @@ mpas_tools=0.15.0
 nco
 netcdf4=*=nompi_*
 numpy
+otps=2021.10
 progressbar2
 pyamg >=4.2.2
 pyproj

diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml
@@ -59,6 +59,7 @@ requirements:
     - nco
     - netcdf4 * nompi_*
     - numpy
+    - otps 2021.10  # [linux]
     - progressbar2
     - pyamg >=4.2.2
     - pyproj