diff --git a/ci/environment-py3.11-win.yml b/ci/environment-py3.11-win.yml index 0a41c2e..eb7005d 100644 --- a/ci/environment-py3.11-win.yml +++ b/ci/environment-py3.11-win.yml @@ -11,7 +11,7 @@ dependencies: - requests - scikit-learn - xarray - - xoak + # - xoak - pytest - pytest-benchmark - pip: diff --git a/ci/environment-py3.11.yml b/ci/environment-py3.11.yml index 6e4fd1c..5c00d48 100644 --- a/ci/environment-py3.11.yml +++ b/ci/environment-py3.11.yml @@ -12,7 +12,7 @@ dependencies: - scikit-learn - xarray - xesmf - - xoak + # - xoak # - xroms - pytest - pytest-benchmark diff --git a/ci/environment-py3.12-win.yml b/ci/environment-py3.12-win.yml index 8a2dd20..94301e9 100644 --- a/ci/environment-py3.12-win.yml +++ b/ci/environment-py3.12-win.yml @@ -11,7 +11,7 @@ dependencies: - requests - scikit-learn - xarray - - xoak + # - xoak # - xroms - pytest - pytest-benchmark diff --git a/ci/environment-py3.12.yml b/ci/environment-py3.12.yml index 911a931..4e2f8a7 100644 --- a/ci/environment-py3.12.yml +++ b/ci/environment-py3.12.yml @@ -12,7 +12,7 @@ dependencies: - scikit-learn - xarray - xesmf - - xoak + # - xoak # - xroms - pytest - pytest-benchmark diff --git a/ci/environment-py3.13-win.yml b/ci/environment-py3.13-win.yml index 69a6878..e4b9ee6 100644 --- a/ci/environment-py3.13-win.yml +++ b/ci/environment-py3.13-win.yml @@ -11,7 +11,7 @@ dependencies: - requests - scikit-learn - xarray - - xoak + # - xoak # - xroms - pytest - pytest-benchmark diff --git a/ci/environment-py3.13.yml b/ci/environment-py3.13.yml index 296b594..d82b149 100644 --- a/ci/environment-py3.13.yml +++ b/ci/environment-py3.13.yml @@ -12,7 +12,7 @@ dependencies: - scikit-learn - xarray - xesmf - - xoak + # - xoak # - xroms - pytest - pytest-benchmark diff --git a/docs/environment.yml b/docs/environment.yml index 5796787..480d1a4 100644 --- a/docs/environment.yml +++ b/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 diff --git a/environment-win.yml b/environment-win.yml index 210aeb2..dd8817c 100644 --- a/environment-win.yml +++ b/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 diff --git a/extract_model/extract_model.py b/extract_model/extract_model.py index 503cd07..f14e450 100644 --- a/extract_model/extract_model.py +++ b/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: