Merge branch 'main' into release

NCAR · Sep 26, 2024 · e4ea340 · e4ea340
2 parents c03ea30 + e98661f
commit e4ea340
Show file tree

Hide file tree

Showing 35 changed files with 9,365 additions and 11,792 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,7 +1,7 @@
 cff-version: 1.2.0
 message: If you use this software, please cite it as below.
 title: MusicBox
-version: v2.1.0
+version: v2.5.0
 authors:
   - family-names: Dawson
     given-names: Matthew

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ classifiers = ["License :: OSI Approved :: Apache Software License"]
 dynamic = ["version", "description"]
 
 dependencies = [
-  "musica==0.7.3",
+  "musica==0.8.0",
   "xarray",
   "colorlog",
   "pandas",

diff --git a/src/acom_music_box/__init__.py b/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.4.0"
+__version__ = "2.5.0"
 
 from .utils import convert_time, convert_pressure, convert_temperature, convert_concentration
 from .species import Species

diff --git a/src/acom_music_box/examples/configs/carbon_bond_5/camp_data/config.json b/src/acom_music_box/examples/configs/carbon_bond_5/camp_data/config.json
@@ -1 +1,7 @@
-{"camp-files": ["species.json", "reactions.json"]}
+{
+  "camp-files" : [
+    "species.json",
+    "reactions.json",
+    "tolerance.json"
+  ]
+}