Merge pull request #106 from kthyng/demoting_xoak

demoting xoak so quit getting deprecation warning everywhere

Author: kthyng

ci/environment-py3.11-win.yml

@@ -11,7 +11,7 @@ dependencies:
   - requests
   - scikit-learn
   - xarray
-  - xoak
+  # - xoak
   - pytest
   - pytest-benchmark
   - pip:

ci/environment-py3.11.yml

@@ -12,7 +12,7 @@ dependencies:
   - scikit-learn
   - xarray
   - xesmf
-  - xoak
+  # - xoak
   # - xroms
   - pytest
   - pytest-benchmark

ci/environment-py3.12-win.yml

@@ -11,7 +11,7 @@ dependencies:
   - requests
   - scikit-learn
   - xarray
-  - xoak
+  # - xoak
   # - xroms
   - pytest
   - pytest-benchmark

ci/environment-py3.12.yml

@@ -12,7 +12,7 @@ dependencies:
   - scikit-learn
   - xarray
   - xesmf
-  - xoak
+  # - xoak
   # - xroms
   - pytest
   - pytest-benchmark

ci/environment-py3.13-win.yml

@@ -11,7 +11,7 @@ dependencies:
   - requests
   - scikit-learn
   - xarray
-  - xoak
+  # - xoak
   # - xroms
   - pytest
   - pytest-benchmark

ci/environment-py3.13.yml

@@ -12,7 +12,7 @@ dependencies:
   - scikit-learn
   - xarray
   - xesmf
-  - xoak
+  # - xoak
   # - xroms
   - pytest
   - pytest-benchmark

docs/environment.yml

@@ -19,7 +19,7 @@ dependencies:
    - xarray
    - xcmocean
    - xesmf  # don't install if on windows
-   - xoak
+  #  - xoak
    # These are needed for the docs themselves
    - furo
    - jupytext

environment-win.yml

@@ -2,7 +2,7 @@ name: extract_model
 channels:
   - conda-forge
 dependencies:
-  - python>=3.7,<3.10
+  - python>=3.7
   # Required for full project functionality (dont remove)
   - pytest
   - pytest-benchmark
@@ -21,6 +21,6 @@ dependencies:
   - scikit-learn  # used by xoak for tree
   - xarray
   - xcmocean
-  - xoak
+  # - xoak
   # - pip:  # install from github to get recent PRs I contributed
   #   - git@github.com:xarray-contrib/cf-xarray.git

extract_model/extract_model.py

@@ -10,7 +10,6 @@
 import cf_xarray  # noqa: F401
 import numpy as np
 import xarray as xr
-import xoak  # noqa: F401
 
 from dask.delayed import Delayed
 from xarray import DataArray, Dataset
@@ -819,6 +818,7 @@ def sel2d(
         lons, lats = np.array(lons), np.array(lats)
 
     if use_xoak:
+        import xoak  # noqa: F401
 
         # 1D or 2D
         if lons.ndim == lats.ndim == 1: