From 860cba0c13078c0548f59d9b529aa7fcdb644d26 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:21:40 -0700
Subject: [PATCH] add macOS M1 build to CI and remove numpy version exclude

---
 .github/workflows/ci.yml   | 12 ++++++++----
 build_envs/Darwin.yml      |  2 +-
 build_envs/Linux.yml       |  2 +-
 build_envs/Win64.yml       |  2 +-
 build_envs/environment.yml | 20 ++++++++++++++++++++
 setup.py                   |  2 --
 6 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 build_envs/environment.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0916710..cbcb184 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,8 +17,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "ubuntu-latest", "macos-latest"]
-        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
+        os: [ "ubuntu-latest", "macos-latest", "macos-14" ]
+        python-version: [ "3.9", "3.10", "3.11" ]
 
     steps:
       - name: Cancel previous runs
@@ -34,11 +34,15 @@ jobs:
         with:
           activate-environment: wrf_python_build
           python-version: ${{ matrix.python-version }}
-          channels: conda-forge, ncar
-      - name: Conda install (Darwin)
+          channels: conda-forge
+      - name: Conda install (macOS - Intel)
         if: matrix.os == 'macos-latest'
         run: |
           conda env update --file build_envs/Darwin.yml --prune
+      - name: Conda install (macOS - ARM)
+        if: matrix.os == 'macos-latest'
+        run: |
+          conda env update --file build_envs/environment.yml --prune
       - name: Conda install (Linux)
         if: matrix.os == 'ubuntu-latest'
         run: |
diff --git a/build_envs/Darwin.yml b/build_envs/Darwin.yml
index 3ea338f..044292e 100644
--- a/build_envs/Darwin.yml
+++ b/build_envs/Darwin.yml
@@ -11,7 +11,7 @@ dependencies:
   - jupyter
   - matplotlib
   - netcdf4
-  - numpy!=1.24.3
+  - numpy
   - pycodestyle
   - setuptools
   - sphinx
diff --git a/build_envs/Linux.yml b/build_envs/Linux.yml
index f0609d8..60af2aa 100644
--- a/build_envs/Linux.yml
+++ b/build_envs/Linux.yml
@@ -11,7 +11,7 @@ dependencies:
   - jupyter
   - matplotlib
   - netcdf4
-  - numpy!=1.24.3
+  - numpy
   - pycodestyle
   - setuptools
   - sphinx
diff --git a/build_envs/Win64.yml b/build_envs/Win64.yml
index 82b3ea0..e9bb70a 100644
--- a/build_envs/Win64.yml
+++ b/build_envs/Win64.yml
@@ -11,7 +11,7 @@ dependencies:
   - m2w64-toolchain
   - matplotlib
   - netcdf4
-  - numpy!=1.24.3
+  - numpy
   - pycodestyle
   - setuptools
   - sphinx
diff --git a/build_envs/environment.yml b/build_envs/environment.yml
new file mode 100644
index 0000000..8b46c24
--- /dev/null
+++ b/build_envs/environment.yml
@@ -0,0 +1,20 @@
+# Create full conda environment for development, including some useful tools
+name: wrf_python_build
+channels:
+  - conda-forge
+dependencies:
+  - python>=3.9, <3.12
+  - compilers
+  - basemap
+  - cartopy
+  - jupyter
+  - matplotlib
+  - netcdf4
+  - numpy
+  - pycodestyle
+  - setuptools
+  - sphinx
+  - sphinx_rtd_theme
+  - wrapt
+  - xarray
+
diff --git a/setup.py b/setup.py
index e9eaaf7..9c38c9a 100755
--- a/setup.py
+++ b/setup.py
@@ -103,8 +103,6 @@
                  "Intended Audience :: Developers",
                  "License :: OSI Approved :: Apache Software License",
                  "Programming Language :: Fortran",
-                 "Programming Language :: Python :: 3.7",
-                 "Programming Language :: Python :: 3.8",
                  "Programming Language :: Python :: 3.9",
                  "Programming Language :: Python :: 3.10",
                  "Programming Language :: Python :: 3.11",