From 58fe311c39eef7966d66069f13ca98d291e6f82a Mon Sep 17 00:00:00 2001
From: Brian Rose <brose@albany.edu>
Date: Mon, 31 Jan 2022 21:00:46 -0500
Subject: [PATCH 1/4] Add switch to skip emanual convection tests on mac os

---
 climlab/tests/test_emanuel_convection.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/climlab/tests/test_emanuel_convection.py b/climlab/tests/test_emanuel_convection.py
index 35805a82..d83e679c 100644
--- a/climlab/tests/test_emanuel_convection.py
+++ b/climlab/tests/test_emanuel_convection.py
@@ -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
@@ -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():
@@ -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():

From f4596ec505e116c0b4fc8e59f85fe3b8aaa467ef Mon Sep 17 00:00:00 2001
From: Brian Rose <brose@albany.edu>
Date: Mon, 31 Jan 2022 21:01:28 -0500
Subject: [PATCH 2/4] New conda environment for MacOS-ARM64

---
 ci/requirements-macos-arm64.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 ci/requirements-macos-arm64.yml

diff --git a/ci/requirements-macos-arm64.yml b/ci/requirements-macos-arm64.yml
new file mode 100644
index 00000000..2ce5a327
--- /dev/null
+++ b/ci/requirements-macos-arm64.yml
@@ -0,0 +1,16 @@
+name: test_env
+channels:
+  - conda-forge
+dependencies:
+  - pip
+  - pooch
+  - xarray
+  - numpy
+  - scipy
+  - gfortran_osx-arm64
+  - libgfortran
+  - future
+  - attrdict
+  - pytest
+  - codecov
+  - pytest-cov

From 2ac97b505ee8bcdbdfd0ac1103238ed9caa10c55 Mon Sep 17 00:00:00 2001
From: Brian Rose <brose@albany.edu>
Date: Tue, 1 Feb 2022 12:20:35 -0500
Subject: [PATCH 3/4] Rename readthedocs config file

---
 readthedocs.yml => .readthedocs.yaml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename readthedocs.yml => .readthedocs.yaml (100%)

diff --git a/readthedocs.yml b/.readthedocs.yaml
similarity index 100%
rename from readthedocs.yml
rename to .readthedocs.yaml

From 9aac29922bd0984077310a6481e36c570f59c335 Mon Sep 17 00:00:00 2001
From: Brian Rose <brose@albany.edu>
Date: Fri, 4 Feb 2022 17:29:56 -0500
Subject: [PATCH 4/4] Remove attrdict from dependencies

---
 ci/requirements-macos-arm64.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/requirements-macos-arm64.yml b/ci/requirements-macos-arm64.yml
index 2ce5a327..3912b643 100644
--- a/ci/requirements-macos-arm64.yml
+++ b/ci/requirements-macos-arm64.yml
@@ -10,7 +10,6 @@ dependencies:
   - gfortran_osx-arm64
   - libgfortran
   - future
-  - attrdict
   - pytest
   - codecov
   - pytest-cov