xbudget 0.5.0__tar.gz → 0.6.0__tar.gz

xbudget-0.6.0/.github/ci.yml

@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.12', '3.13', '3.14', '3.15']
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.7.0
+        with:
+          access_token: ${{ github.token }}
+      - name: Checkout source
+        uses: actions/checkout@v2
+
+      - name: Conda setup
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          channels: conda-forge
+          mamba-version: '*'
+          python-version: ${{ matrix.python-version }}
+          activate-environment: test_env_xbudget
+          auto-activate-base: false
+
+      - name: Set up conda environment
+        run: |
+          mamba env update -f ci/environment.yml
+          python -m pip install -e .
+      - name: Conda list information
+        run: |
+          conda env list
+          conda list
+      - name: Test with pytest
+        run: |
+          pytest

{xbudget-0.5.0 → xbudget-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xbudget
-Version: 0.5.0
+Version: 0.6.0
 Summary: Helper functions and meta-data conventions for wrangling finite-volume ocean model budgets
 Project-URL: Homepage, https://github.com/hdrake/xbudget
 Project-URL: Bugs/Issues/Features, https://github.com/hdrake/xbudget/issues
@@ -9,7 +9,7 @@ License-File: LICENSE
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.12
 Requires-Dist: numpy
 Requires-Dist: xarray
 Requires-Dist: xgcm>=0.9.0

{xbudget-0.5.0 → xbudget-0.6.0}/ci/environment.yml

@@ -2,7 +2,7 @@ name: test_env_xbudget
 channels:
   - conda-forge
 dependencies:
-  - python>=3.8
+  - python>=3.12
   - cftime
   - netcdf4
   - pydap

{xbudget-0.5.0 → xbudget-0.6.0}/docs/environment.yml

@@ -2,7 +2,7 @@ name: docs_env_xbudget
 channels:
   - conda-forge
 dependencies:
-  - python>=3.8
+  - python==3.12
   - cftime
   - ipython
   - jupyterlab
@@ -10,4 +10,4 @@ dependencies:
   - netcdf4
   - pydap
   - pytest
-  - pip
+  - pip

{xbudget-0.5.0 → xbudget-0.6.0}/pyproject.toml

@@ -6,7 +6,7 @@ authors = [
 ]
 description = "Helper functions and meta-data conventions for wrangling finite-volume ocean model budgets"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",

{xbudget-0.5.0 → xbudget-0.6.0}/xbudget/collect.py

@@ -219,13 +219,15 @@ def budget_fill_dict(data, xbudget_dict, namepath):
                     v_term_recursive = budget_fill_dict(data, v_term, f"{namepath}_{k}_{k_term}")
                     if v_term_recursive is not None:
                         op_list.append(v_term_recursive)
+                    elif v_term.get("var") is not None and v_term.get("var") not in ds:
+                        warnings.warn(f"Variable {v_term.get('var')} is missing from the dataset `ds`, so it is being skipped. To suppress this warning, remove {v_term.get('var')} from the `xbudget_dict`.", UserWarning)
                 elif isinstance(v_term, numbers.Number):
                     op_list.append(v_term)
                 elif isinstance(v_term, str):
                     if v_term in ds:
                         op_list.append(ds[v_term])
                     else:
-                        warnings.warn(f"Variable {v_term} is missing from the dataset `ds`, so it is being skipped. To suppress this warning, remove {v_term} from the `xbudget_dict`.")
+                        warnings.warn(f"Variable {v_term} is missing from the dataset `ds`, so it is being skipped. To suppress this warning, remove {v_term} from the `xbudget_dict`.", UserWarning)
                         if k=="product":
                             op_list.append(0.)