From 04c7454546020250c25d10c23866b8b5452f70b1 Mon Sep 17 00:00:00 2001 From: Kristen Thyng Date: Thu, 28 Aug 2025 08:22:10 -0700 Subject: [PATCH 1/2] demoting xoak so quit getting deprecation warning everywhere --- ci/environment-py3.11-win.yml | 4 ++-- ci/environment-py3.11.yml | 4 ++-- ci/environment-py3.12-win.yml | 4 ++-- ci/environment-py3.12.yml | 4 ++-- ci/environment-py3.13-win.yml | 4 ++-- ci/environment-py3.13.yml | 4 ++-- docs/environment.yml | 4 ++-- environment-win.yml | 6 +++--- extract_model/extract_model.py | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ci/environment-py3.11-win.yml b/ci/environment-py3.11-win.yml index 0a41c2e..cbf462c 100644 --- a/ci/environment-py3.11-win.yml +++ b/ci/environment-py3.11-win.yml @@ -9,9 +9,9 @@ dependencies: - numpy - pip - requests - - scikit-learn + # - 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..7ea6828 100644 --- a/ci/environment-py3.11.yml +++ b/ci/environment-py3.11.yml @@ -9,10 +9,10 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - - scikit-learn + # - 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..a9f9ff9 100644 --- a/ci/environment-py3.12-win.yml +++ b/ci/environment-py3.12-win.yml @@ -9,9 +9,9 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - - scikit-learn + # - 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..631decd 100644 --- a/ci/environment-py3.12.yml +++ b/ci/environment-py3.12.yml @@ -9,10 +9,10 @@ dependencies: - numpy - pip - requests - - scikit-learn + # - 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..a897c91 100644 --- a/ci/environment-py3.13-win.yml +++ b/ci/environment-py3.13-win.yml @@ -9,9 +9,9 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - - scikit-learn + # - 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..4debe54 100644 --- a/ci/environment-py3.13.yml +++ b/ci/environment-py3.13.yml @@ -9,10 +9,10 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - - scikit-learn + # - scikit-learn - xarray - xesmf - - xoak + # - xoak # - xroms - pytest - pytest-benchmark diff --git a/docs/environment.yml b/docs/environment.yml index 5796787..6573f7a 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -15,11 +15,11 @@ dependencies: - pip - pooch - requests - - scikit-learn # used by xoak for tree + # - scikit-learn # used by xoak for tree - 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..791a1a6 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 @@ -18,9 +18,9 @@ dependencies: - pip - pooch - requests - - scikit-learn # used by xoak for tree + # - 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: From beb516520976e78f5c4450f92fc843c6a6f7710e Mon Sep 17 00:00:00 2001 From: Kristen Thyng Date: Thu, 28 Aug 2025 08:38:13 -0700 Subject: [PATCH 2/2] added sklearn back in for Tree --- ci/environment-py3.11-win.yml | 2 +- ci/environment-py3.11.yml | 2 +- ci/environment-py3.12-win.yml | 2 +- ci/environment-py3.12.yml | 2 +- ci/environment-py3.13-win.yml | 2 +- ci/environment-py3.13.yml | 2 +- docs/environment.yml | 2 +- environment-win.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/environment-py3.11-win.yml b/ci/environment-py3.11-win.yml index cbf462c..eb7005d 100644 --- a/ci/environment-py3.11-win.yml +++ b/ci/environment-py3.11-win.yml @@ -9,7 +9,7 @@ dependencies: - numpy - pip - requests - # - scikit-learn + - scikit-learn - xarray # - xoak - pytest diff --git a/ci/environment-py3.11.yml b/ci/environment-py3.11.yml index 7ea6828..5c00d48 100644 --- a/ci/environment-py3.11.yml +++ b/ci/environment-py3.11.yml @@ -9,7 +9,7 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - # - scikit-learn + - scikit-learn - xarray - xesmf # - xoak diff --git a/ci/environment-py3.12-win.yml b/ci/environment-py3.12-win.yml index a9f9ff9..94301e9 100644 --- a/ci/environment-py3.12-win.yml +++ b/ci/environment-py3.12-win.yml @@ -9,7 +9,7 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - # - scikit-learn + - scikit-learn - xarray # - xoak # - xroms diff --git a/ci/environment-py3.12.yml b/ci/environment-py3.12.yml index 631decd..4e2f8a7 100644 --- a/ci/environment-py3.12.yml +++ b/ci/environment-py3.12.yml @@ -9,7 +9,7 @@ dependencies: - numpy - pip - requests - # - scikit-learn + - scikit-learn - xarray - xesmf # - xoak diff --git a/ci/environment-py3.13-win.yml b/ci/environment-py3.13-win.yml index a897c91..e4b9ee6 100644 --- a/ci/environment-py3.13-win.yml +++ b/ci/environment-py3.13-win.yml @@ -9,7 +9,7 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - # - scikit-learn + - scikit-learn - xarray # - xoak # - xroms diff --git a/ci/environment-py3.13.yml b/ci/environment-py3.13.yml index 4debe54..d82b149 100644 --- a/ci/environment-py3.13.yml +++ b/ci/environment-py3.13.yml @@ -9,7 +9,7 @@ dependencies: - numpy #<1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615 - pip - requests - # - scikit-learn + - scikit-learn - xarray - xesmf # - xoak diff --git a/docs/environment.yml b/docs/environment.yml index 6573f7a..480d1a4 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -15,7 +15,7 @@ dependencies: - pip - pooch - requests - # - scikit-learn # used by xoak for tree + - scikit-learn # used by xoak for tree - xarray - xcmocean - xesmf # don't install if on windows diff --git a/environment-win.yml b/environment-win.yml index 791a1a6..dd8817c 100644 --- a/environment-win.yml +++ b/environment-win.yml @@ -18,7 +18,7 @@ dependencies: - pip - pooch - requests - # - scikit-learn # used by xoak for tree + - scikit-learn # used by xoak for tree - xarray - xcmocean # - xoak