Skip to content

Commit 35b2770

Browse files
authored
Merge pull request #487 from xylar/fix_otps_osx
Disable otps on OSX
2 parents d7303af + 6ccaaf8 commit 35b2770

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

conda/bootstrap.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,9 @@ def build_conda_env(env_type, recreate, machine, mpi, conda_mpi, version,
266266
template = Template(f.read())
267267

268268
if env_type == 'dev':
269-
spec_file = template.render(mpi=conda_mpi, mpi_prefix=mpi_prefix)
269+
supports_otps = platform.system() == 'Linux'
270+
spec_file = template.render(supports_otps=supports_otps,
271+
mpi=conda_mpi, mpi_prefix=mpi_prefix)
270272

271273
spec_filename = f'spec-file-{conda_mpi}.txt'
272274
with open(spec_filename, 'w') as handle:

conda/compass_env/spec-file.template

+2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ mpas_tools=0.15.0
2222
nco
2323
netcdf4=*=nompi_*
2424
numpy
25+
{% if supports_otps %}
2526
otps=2021.10
27+
{% endif %}
2628
progressbar2
2729
pyamg >=4.2.2
2830
pyproj

0 commit comments

Comments
 (0)