Skip to content

Commit

Permalink
add macOS M1 build to CI and remove numpy version exclude
Browse files Browse the repository at this point in the history
  • Loading branch information
kafitzgerald committed Feb 1, 2024
1 parent 555a030 commit 860cba0
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 9 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion build_envs/Darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- jupyter
- matplotlib
- netcdf4
- numpy!=1.24.3
- numpy
- pycodestyle
- setuptools
- sphinx
Expand Down
2 changes: 1 addition & 1 deletion build_envs/Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- jupyter
- matplotlib
- netcdf4
- numpy!=1.24.3
- numpy
- pycodestyle
- setuptools
- sphinx
Expand Down
2 changes: 1 addition & 1 deletion build_envs/Win64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- m2w64-toolchain
- matplotlib
- netcdf4
- numpy!=1.24.3
- numpy
- pycodestyle
- setuptools
- sphinx
Expand Down
20 changes: 20 additions & 0 deletions build_envs/environment.yml
Original file line number Diff line number Diff line change
@@ -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

2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 860cba0

Please sign in to comment.