Skip to content

Commit

Permalink
Merge pull request #158 from brian-rose/osx-arm64
Browse files Browse the repository at this point in the history
Support builds on OSX-ARM64
  • Loading branch information
brian-rose committed Feb 5, 2022
2 parents 637321d + 9aac299 commit 76bba0a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
15 changes: 15 additions & 0 deletions ci/requirements-macos-arm64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: test_env
channels:
- conda-forge
dependencies:
- pip
- pooch
- xarray
- numpy
- scipy
- gfortran_osx-arm64
- libgfortran
- future
- pytest
- codecov
- pytest-cov
4 changes: 3 additions & 1 deletion climlab/tests/test_emanuel_convection.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from climlab.convection import emanuel_convection
from climlab.tests.xarray_test import to_xarray
import pytest
import sys


# These test data are based on direct single-column tests of the CONVECT43c.f
Expand Down Expand Up @@ -49,7 +50,7 @@
emanuel_convection.G=9.8
emanuel_convection.ROWL=1000.0


@pytest.mark.skipif(sys.platform == "darwin", reason="problematic on Mac OS for some reason")
@pytest.mark.compiled
@pytest.mark.fast
def test_convect_tendencies():
Expand All @@ -76,6 +77,7 @@ def test_convect_tendencies():
assert FU == pytest.approx(tend['U'], rel=tol)
assert FV == pytest.approx(tend['V'], rel=tol)

@pytest.mark.skipif(sys.platform == "darwin", reason="problematic on Mac OS for some reason")
@pytest.mark.compiled
@pytest.mark.fast
def test_multidim_tendencies():
Expand Down

0 comments on commit 76bba0a

Please sign in to comment.