Merge branch 'main' into ao_seaice_file_sft

.github/workflows/build_workflow.yml

@@ -60,9 +60,18 @@ jobs:
           miniforge-version: latest
           activate-environment: "pcmdi_metrics_ci"
           environment-file: conda-env/ci.yml
-          channel-priority: strict
+          channel-priority: flexible
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
+          use-mamba: false
+          conda-solver: classic
+
+      - name: Verify Conda Environment
+        run: |
+          conda info
+          conda list
+          conda config --show-sources
+          conda config --show
 
       # Used for refreshing the cache every 24 hours to avoid inconsistencies of package
       # versions between the CI pipeline and local installations.
@@ -128,6 +137,7 @@ jobs:
           environment-file: conda-env/dev.yml
           channel-priority: strict
           auto-update-conda: true
+          use-mamba: false  # Disable libmamba solver
 
       - name: Install pcmdi_metrics
         # Source: https://github.com/conda/conda-build/issues/4251#issuecomment-1053460542

CITATION.cff

@@ -0,0 +1,49 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: PCMDI Metrics Package
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Jiwoo
+    family-names: Lee
+    email: [email protected]
+    affiliation: Lawrence Livermore National Laboratory
+    orcid: 'https://orcid.org/0000-0002-0016-7199'
+  - family-names: Gleckler
+    given-names: Peter
+    affiliation: Lawrence Livermore National Laboratory
+    orcid: 'https://orcid.org/0000-0003-2816-6224'
+  - family-names: Ordonez
+    given-names: Ana
+    affiliation: Lawrence Livermore National Laboratory
+  - given-names: Bo
+    family-names: Dong
+    affiliation: Lawrence Livermore National Laboratory
+  - affiliation: Lawrence Livermore National Laboratory
+    given-names: Kristin
+    family-names: Chang
+  - given-names: Paul
+    family-names: Ullrich
+    affiliation: Lawrence Livermore National Laboratory and UC Davis
+    orcid: 'https://orcid.org/0000-0003-4118-4590'
+identifiers:
+  - type: doi
+    value: 10.5281/zenodo.592790
+    description: Software
+repository-code: 'https://github.com/PCMDI/pcmdi_metrics'
+url: 'http://pcmdi.github.io/pcmdi_metrics/'
+abstract: ' Open-source Python package for Systematic Evaluation of Climate and Earth System Models '
+keywords:
+  - climate
+  - climate modeling
+  - climate model evaluation
+  - Earth System Model evaluation
+  - climatology
+  - climate variability
+license: BSD-3-Clause
+version: '3.8'
+date-released: '2024-12-04'

README.md

@@ -120,6 +120,7 @@ Release Notes and History
 
 | <div style="width:300%">[Versions]</div> | Update summary   |
 | ------------- | ------------------------------------- |
+| [v3.8]        | New capability (**figure generation for ENSO**, xCDAT migration completed for **Monsoon Wang** with figure generation), major dependency update (`numpy` >= 2.0)
 | [v3.7.2]      | Technical update
 | [v3.7.1]      | Technical update with documentation improvements
 | [v3.7]        | New capability (**figure generation for mean climate**) and technical update
@@ -170,6 +171,7 @@ Release Notes and History
 </details>
 
 [Versions]: https://github.com/PCMDI/pcmdi_metrics/releases
+[v3.8]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.8
 [v3.7.2]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.7.2
 [v3.7.1]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.7.1
 [v3.7]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.7

conda-env/ci.yml

@@ -10,26 +10,27 @@ dependencies:
     # NOTE: If versions are updated, also `additional_dependencies` list for mypy in `.pre-commit-config.yaml`
     - python=3.10.10
     - pip=23.1.2
-    - numpy=1.23.5
-    - cartopy=0.22.0
-    - matplotlib=3.7.1
-    - cdms2=3.1.5
+    - numpy >=2.0.0,<3.0.0
+    - cartopy >=0.22.0
+    - matplotlib >=3.7.1
+    - cdms2 >=3.1.5
     - genutil=8.2.1
     - cdutil=8.2.1
     - cdp=1.7.0
-    - eofs=1.4.1
+    - eofs=2.0.0
     - seaborn=0.12.2
-    - enso_metrics=1.1.1
-    - xcdat>=0.7.0
+    - enso_metrics=1.1.4
+    - xcdat=0.7.3
     - xmltodict=0.13.0
     - setuptools=67.7.2
     - netcdf4>=1.6.3
-    - regionmask=0.9.0
+    - regionmask=0.12.1
     - rasterio>=1.3.6
-    - shapely=2.0.1
+    - shapely >=2.0.1
     - numdifftools
     - nc-time-axis
     - colorcet
+    - cmocean
     # ==================
     # Testing
     # ==================

conda-env/dev.yml

@@ -10,26 +10,27 @@ dependencies:
     # NOTE: If versions are updated, also `additional_dependencies` list for mypy in `.pre-commit-config.yaml`
     - python=3.10.10
     - pip=23.1.2
-    - numpy=1.23.5
-    - cartopy=0.22.0
-    - matplotlib=3.7.1
-    - cdms2=3.1.5
+    - numpy >=2.0.0,<3.0.0
+    - cartopy >=0.22.0
+    - matplotlib >=3.7.1
+    - cdms2 >=3.1.5
     - genutil=8.2.1
     - cdutil=8.2.1
     - cdp=1.7.0
-    - eofs=1.4.1
+    - eofs=2.0.0
     - seaborn=0.12.2
-    - enso_metrics=1.1.1
-    - xcdat>=0.7.2
+    - enso_metrics=1.1.4
+    - xcdat=0.7.3
     - xmltodict=0.13.0
     - setuptools=67.7.2
     - netcdf4>=1.6.3
-    - regionmask=0.9.0
+    - regionmask=0.12.1
     - rasterio>=1.3.6
-    - shapely=2.0.1
+    - shapely >=2.0.1
     - numdifftools
     - nc-time-axis
     - colorcet
+    - cmocean
     # ==================
     # Testing
     # ==================