Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/windows_arm64_steps/action.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Windows ARM64 Setup
description: Setup MSYS2 ARM64 for CI

# this is currently not used because there was a compiler issue
# where the visibilty flags set by pybind11 caused build failures
# on Windows ARM64 with Clang. Leaving this action here for future use
# because it was difficult for me to figure out what packages were needed

runs:
using: "composite"
steps:
Expand All @@ -15,10 +10,11 @@ runs:
update: true
install: |
mingw-w64-clang-aarch64-cmake
mingw-w64-clang-aarch64-make
mingw-w64-clang-aarch64-ninja
mingw-w64-clang-aarch64-clang
mingw-w64-clang-aarch64-flang
mingw-w64-clang-aarch64-hdf5
mingw-w64-clang-aarch64-ninja
mingw-w64-clang-aarch64-netcdf
mingw-w64-clang-aarch64-netcdf-fortran
mingw-w64-clang-aarch64-openblas
Expand Down
89 changes: 0 additions & 89 deletions .github/workflows/python-tests.yml

This file was deleted.

25 changes: 13 additions & 12 deletions .github/workflows/python-wheels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Python Package
name: Python

on:
push:
Expand Down Expand Up @@ -39,27 +39,25 @@ jobs:
include:
# Linux builds
- os: ubuntu-latest
python-version: "3.14"
cibw_archs: "x86_64 i686"

- os: ubuntu-24.04-arm
python-version: "3.14"
cibw_archs: "aarch64"

# Windows builds (separate runners needed for different archs)
- os: windows-latest
python-version: "3.14"
cibw_archs: "AMD64"

- os: windows-11-arm
cibw_archs: "ARM64"

# macOS Intel
- os: macos-15-intel
python-version: "3.14"
cibw_archs: "x86_64"
fc: gfortran-15

# macOS Apple Silicon
- os: macos-latest
python-version: "3.14"
cibw_archs: "arm64"
fc: gfortran-15

Expand All @@ -70,22 +68,25 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: "3.14"

- name: Set up Windows AMD64
if: matrix.os == 'windows-latest'
uses: ./.github/windows_amd64_steps

# the if implicitly uses the fact that arm on windows is not running on windows-latest
- name: Set up Windows ARM64
if: matrix.os == 'windows-11-arm'
uses: ./.github/windows_arm64_steps

- name: CI Build Wheels
if: matrix.os != 'windows-latest'
if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
uses: pypa/cibuildwheel@v3.1.3
env:
CIBW_ARCHS: ${{ matrix.cibw_archs }}
FC: ${{ matrix.fc }}

- name: CI Build Wheels (Windows with MINGW on AMD64)
if: matrix.os == 'windows-latest'
- name: CI Build Wheels (Windows)
if: startsWith(matrix.os, 'windows')
shell: msys2 {0}
run: |
MSYS2_PYTHON=$(cygpath -u "$pythonLocation")
Expand All @@ -102,7 +103,7 @@ jobs:
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
name: cibw-wheels-${{ matrix.os }}-${{ matrix.cibw_archs }}-py${{ matrix.python-version }}
name: cibw-wheels-${{ matrix.os }}-${{ matrix.cibw_archs }}
path: wheelhouse/*.whl

upload_all:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![macOS](https://github.com/NCAR/musica/actions/workflows/mac.yml/badge.svg)](https://github.com/NCAR/musica/actions/workflows/mac.yml)
[![ubuntu](https://github.com/NCAR/musica/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/NCAR/musica/actions/workflows/ubuntu.yml)
[![windows](https://github.com/NCAR/musica/actions/workflows/windows.yml/badge.svg)](https://github.com/NCAR/musica/actions/workflows/windows.yml)
[![Python tests](https://github.com/NCAR/musica/actions/workflows/python-tests.yml/badge.svg)](https://github.com/NCAR/musica/actions/workflows/python-tests.yml)
[![Python](https://github.com/NCAR/musica/actions/workflows/python-wheels.yml/badge.svg)](https://github.com/NCAR/musica/actions/workflows/python-wheels.yml)
[![Javascript tests](https://github.com/NCAR/musica/actions/workflows/javascript_integration.yml/badge.svg)](https://github.com/NCAR/musica/actions/workflows/javascript_integration.yml)
[![DOI](https://zenodo.org/badge/550370528.svg)](https://zenodo.org/doi/10.5281/zenodo.7458559)
[![PyPI version](https://badge.fury.io/py/musica.svg)](https://pypi.org/p/musica)
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ if(MUSICA_ENABLE_PYTHON_LIBRARY)
set(PYBIND11_NEWPYTHON ON)

set_git_default(PYBIND11_GIT_REPOSITORY https://github.com/pybind/pybind11)
set_git_default(PYBIND11_GIT_TAG v3.0.0)
set_git_default(PYBIND11_GIT_TAG v3.0.1)

FetchContent_Declare(pybind11
GIT_REPOSITORY ${PYBIND11_GIT_REPOSITORY}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"enable diagnostics" : false,
"__description": "This is a configuration for testing the TUV-x MUSICA API",
"O2 absorption": {
"cross section parameters file": "test/data/tuvx/fixed/O2_parameters.txt"
Expand Down Expand Up @@ -109,7 +110,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/fixed/O2_cross_section.nc"
"file path": "configs/tuvx/fixed/O2_cross_section.nc"
}
]
}
Expand Down Expand Up @@ -140,7 +141,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/fixed/foo_cross_section.nc"
"file path": "configs/tuvx/fixed/foo_cross_section.nc"
}
]
},
Expand All @@ -158,7 +159,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/fixed/bar_cross_section.nc"
"file path": "configs/tuvx/fixed/bar_cross_section.nc"
}
]
},
Expand All @@ -176,7 +177,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/fixed/foo_cross_section.nc"
"file path": "configs/tuvx/fixed/foo_cross_section.nc"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"enable diagnostics" : false,
"__description": "This is a configuration for testing the TUV-x MUSICA API",
"O2 absorption": {
"cross section parameters file": "test/data/tuvx/from_host/O2_parameters.txt"
"cross section parameters file": "test/tuvx/from_host/O2_parameters.txt"
},
"grids": [
],
Expand Down Expand Up @@ -61,7 +62,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/from_host/O2_cross_section.nc"
"file path": "configs/tuvx/from_host/O2_cross_section.nc"
}
]
}
Expand Down Expand Up @@ -92,7 +93,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/from_host/foo_cross_section.nc"
"file path": "configs/tuvx/from_host/foo_cross_section.nc"
}
]
},
Expand All @@ -110,7 +111,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/from_host/bar_cross_section.nc"
"file path": "configs/tuvx/from_host/bar_cross_section.nc"
}
]
},
Expand All @@ -128,7 +129,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/from_host/foo_cross_section.nc"
"file path": "configs/tuvx/from_host/foo_cross_section.nc"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"enable diagnostics" : false,
"__description": "This is a configuration for testing the TUV-x MUSICA API",
"O2 absorption": {
"cross section parameters file": "test/data/tuvx/full_from_host/O2_parameters.txt"
"cross section parameters file": "configs/tuvx/full_from_host/O2_parameters.txt"
},
"grids": [],
"profiles": [],
Expand All @@ -19,7 +20,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/full_from_host/O2_cross_section.nc"
"file path": "configs/tuvx/full_from_host/O2_cross_section.nc"
}
]
}
Expand Down Expand Up @@ -50,7 +51,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/full_from_host/foo_cross_section.nc"
"file path": "configs/tuvx/full_from_host/foo_cross_section.nc"
}
]
},
Expand All @@ -68,7 +69,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/full_from_host/bar_cross_section.nc"
"file path": "configs/tuvx/full_from_host/bar_cross_section.nc"
}
]
},
Expand All @@ -86,7 +87,7 @@
"type": "base",
"netcdf files": [
{
"file path": "test/data/tuvx/full_from_host/foo_cross_section.nc"
"file path": "configs/tuvx/full_from_host/foo_cross_section.nc"
}
]
},
Expand Down
Loading
Loading