Version 2.8.0

Version 2.8.0

Author: K20shores

.github/workflows/docker_tests.yml

@@ -0,0 +1,38 @@
+name: Docker
+
+on: 
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  docker-build-and-test:
+    name: Build and Test - ${{ matrix.dockerfile }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        dockerfile:
+          - Dockerfile
+        build_type: [Release, Debug]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
+
+      - name: Build Docker image
+        run: docker build -t music-box -f docker/${{ matrix.dockerfile }} . --build-arg MUSIC_BOX_GIT_TAG=${{ github.sha }} --build-arg BUILD_TYPE=${{ matrix.build_type }}
+
+      - name: Run tests in container
+        run: docker run --name test-container -t music-box

docker/Dockerfile

@@ -0,0 +1,40 @@
+FROM fedora:latest
+
+ARG MUSIC_BOX_TAG=main
+ARG MUSICA_TAG=v0.11.1
+
+RUN dnf -y update \
+    && dnf -y install \
+        cmake \
+        gcc-c++ \
+        gcc-fortran \
+        gdb \
+        git \
+        make \
+        netcdf-fortran-devel \
+        python3 \
+        python3-devel \
+        python3-pip \
+        python3-setuptools \
+    && dnf clean all
+
+COPY . /music-box/
+
+ENV CXX=g++
+ENV CC=gcc
+ENV FC=gfortran
+
+RUN git clone https://github.com/NCAR/musica.git /musica \
+    && cd /musica \
+    && git checkout $MUSICA_TAG
+
+RUN cd /musica && pip3 install .
+
+RUN cd /musica \
+    && pip3 install --verbose .[test] pytest-mock
+
+RUN cd /music-box \
+    && pip3 install --verbose .[test] pytest-mock
+
+WORKDIR /music-box
+CMD ["pytest"]

docker/Dockerfile.docs

@@ -3,8 +3,10 @@ FROM fedora:37
 RUN dnf -y update \
     && dnf -y install \
         git \
+        gcc \
+        gcc-c++ \
         make \
-        python3 \
+        python3-devel \
         python3-pip \
     && dnf clean all
 

pyproject.toml

@@ -21,7 +21,7 @@ classifiers = ["License :: OSI Approved :: Apache Software License"]
 dynamic = ["version", "description"]
 
 dependencies = [
-  "musica==0.10.1",
+  "musica==0.11.1",
   "xarray",
   "colorlog",
   "pandas",

sample_waccm_data/README.md

@@ -22,8 +22,8 @@ for root, _, files in os.walk('data'):
         ds_sel.to_netcdf(f'sample_waccm_data/{file}')
 ```
 
-You can extract a coniguraiton file with 
+You can extract a configuration file with 
 
 ```
 waccmToMusicBox waccmDir="./sample_waccm_data" date="20240904" time="07:00" latitude=3.1 longitude=101.7
-```
+```

src/acom_music_box/__init__.py

@@ -4,7 +4,7 @@
 This package contains modules for handling various aspects of a music box,
 including species, products, reactants, reactions, and more.
 """
-__version__ = "2.7.0"
+__version__ = "2.8.0"
 
 from .utils import convert_time, convert_pressure, convert_temperature, convert_concentration
 from .model_options import BoxModelOptions