Skip to content

Commit 4806b9e

Browse files
committed
Merge branch 'main' into release
2 parents e26bd5c + 457a62c commit 4806b9e

173 files changed

Lines changed: 37232 additions & 24189 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Exclude broken colon symlink (absolute path, unusable inside Docker)
2+
# The test recreates it with a relative path at runtime
3+
sample_waccm_data/20250820/wrf/wrfout_hourly_d01_2025-08-20_08:00:00

.github/ISSUE_TEMPLATE/release.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
name: Version Release
3+
about: Create an issue to make a new release
4+
title: 'Release X.X.X'
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
## Dependency version update
11+
12+
- [ ] Update musica python package version in `pyproject.toml`
13+
14+
## Testing steps
15+
16+
- [ ] GitHub Actions are passing on `main`
17+
- [ ] Launch Binder and run all tutorial examples
18+
19+
## Deployment and release steps
20+
21+
- [ ] on a new branch (call it anything but `release`)
22+
- [ ] Update the music box version in `python/acom_music_box/__init__.py`
23+
- [ ] Update the music box version in `package.json`
24+
- [ ] Update the `CITATION.cff` file
25+
- [ ] Update version number
26+
- [ ] Ensure all contributors are listed as authors
27+
- [ ] On GitHub, merge `main` into `release`**do NOT squash and merge**
28+
- Alternatively, merge locally and push: `git checkout release && git merge main && git push`
29+
- [ ] Make a tag and add release notes on GitHub
30+
- Be sure to choose the `release` branch for the target
31+
## Python (automatic)
32+
PyPI publishing happens automatically via the release action when a tag and release are created.
33+
34+
- [ ] Verify the PyPI release was published successfully
35+
36+
---
37+
38+
## JavaScript (automatic)
39+
40+
npm publishing happens automatically via the release action when a tag and release are created.
41+
42+
- [ ] Verify the npm release was published successfully

.github/workflows/CI_Tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ jobs:
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
41-
cache: 'pip'
41+
cache: 'pip'
4242

4343
- name: Install this package
4444
run: pip install -e '.[dev]'
4545
env:
4646
FC: gfortran-14
4747

4848
- name: Run tests and generate coverage reports
49-
run: pytest --cov src/
49+
run: pytest --cov python/
5050

5151
- name: Upload coverage reports to codecov
5252
if: runner.os == 'Linux'
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Run the smoke tests
5959
run: |
60-
music_box -c src/acom_music_box/examples/configs/analytical/my_config.json -o output.csv
60+
music_box -c examples/analytical/my_config.json -o output.csv
6161
music_box -e Analytical -o output.csv
6262
music_box -e Analytical -o output.csv -vv --color-output
6363
waccmToMusicBox --waccmDir "./sample_waccm_data" --date "20240904" --time "07:00" --latitude 3.1 --longitude 101.7

.github/workflows/javascript.yml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: Javascript Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
pull_request:
9+
workflow_dispatch:
10+
release:
11+
types:
12+
- published
13+
14+
permissions:
15+
contents: read
16+
id-token: write
17+
18+
jobs:
19+
test:
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
platform: [ubuntu-latest, windows-latest, macos-latest]
24+
node-version: ["v22", "v24"]
25+
26+
runs-on: ${{ matrix.platform }}
27+
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@v6
31+
32+
- name: Setup node
33+
uses: actions/setup-node@v6
34+
with:
35+
node-version: ${{ matrix.node-version }}
36+
37+
- name: Install dependencies
38+
run: npm ci
39+
40+
- name: Test
41+
run: npm test
42+
43+
publish:
44+
runs-on: ubuntu-latest
45+
if: (github.event_name == 'release' && github.event.action == 'published') || github.event_name == 'workflow_dispatch'
46+
47+
steps:
48+
- name: Checkout
49+
uses: actions/checkout@v6
50+
51+
- name: Setup node
52+
uses: actions/setup-node@v6
53+
with:
54+
node-version: 24
55+
registry-url: 'https://registry.npmjs.org'
56+
57+
- name: Install dependencies
58+
run: npm ci
59+
60+
- name: Test
61+
run: npm run test
62+
63+
- name: Copy javascript readme
64+
run: cp javascript/README.md README.md # npm uses the root README for the package page
65+
66+
- name: List config
67+
run: |
68+
npm --version
69+
node --version
70+
npm config list -l
71+
72+
- name: Publish to npm
73+
run: NODE_AUTH_TOKEN="" npm publish --access public --provenance

.github/workflows/parity_tests.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: JS/Python Parity Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
jobs:
11+
parity:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
submodules: recursive
18+
19+
- name: Install system dependencies
20+
run: |
21+
sudo apt-get update
22+
sudo apt-get install -y libnetcdf-dev netcdf-bin libnetcdff-dev liblapack-dev
23+
24+
- uses: actions/setup-python@v5
25+
with:
26+
python-version: "3.12"
27+
cache: pip
28+
29+
- uses: actions/setup-node@v4
30+
with:
31+
node-version: "v22"
32+
33+
- name: Install Python package
34+
run: pip install -e '.[dev]'
35+
36+
- name: Install JS dependencies
37+
run: npm ci
38+
39+
- name: Run parity tests
40+
run: python tests/parity_test.py

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ dist
1212
.vscode/
1313
.coverage
1414
src/acom_music_box/examples/configs/ts1/initial_config.json*.csv
15+
sample_waccm_data/**/wrfout_hourly_d01_*:*
16+
.claude
17+
18+
node_modules

.readthedocs.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,20 @@ build:
99
os: ubuntu-24.04
1010
tools:
1111
python: "3.13"
12+
nodejs: "22"
13+
jobs:
14+
pre_build:
15+
- npm install
16+
- cp -r tutorials/* docs/source/tutorials/
1217

1318
# Build documentation in the "docs/" directory with Sphinx
1419
sphinx:
1520
configuration: docs/source/conf.py
1621

17-
# Optionally, but recommended,
18-
# declare the Python requirements required to build your documentation
19-
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
22+
# Install the package with doc extras (includes sphinx-js and all doc dependencies)
2023
python:
2124
install:
2225
- method: pip
2326
path: .
24-
- requirements: docs/requirements.txt
27+
extra_requirements:
28+
- doc

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cff-version: 1.2.0
22
message: If you use this software, please cite it as below.
33
title: MusicBox
4-
version: v2.11.0
4+
version: v3.0.0
55
authors:
66
- family-names: Dawson
77
given-names: Matthew

0 commit comments

Comments
 (0)