Skip to content

demoting xoak so quit getting deprecation warning everywhere #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 28, 2025
Merged

demoting xoak so quit getting deprecation warning everywhere #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04c7454
demoting xoak so quit getting deprecation warning everywhere
kthyng Aug 28, 2025
beb5165
added sklearn back in for Tree
kthyng Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/environment-py3.11-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- requests
- scikit-learn
- xarray
- xoak
# - xoak
- pytest
- pytest-benchmark
- pip:
Expand Down
2 changes: 1 addition & 1 deletion ci/environment-py3.11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- scikit-learn
- xarray
- xesmf
- xoak
# - xoak
# - xroms
- pytest
- pytest-benchmark
Expand Down
2 changes: 1 addition & 1 deletion ci/environment-py3.12-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- requests
- scikit-learn
- xarray
- xoak
# - xoak
# - xroms
- pytest
- pytest-benchmark
Expand Down
2 changes: 1 addition & 1 deletion ci/environment-py3.12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- scikit-learn
- xarray
- xesmf
- xoak
# - xoak
# - xroms
- pytest
- pytest-benchmark
Expand Down
2 changes: 1 addition & 1 deletion ci/environment-py3.13-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- requests
- scikit-learn
- xarray
- xoak
# - xoak
# - xroms
- pytest
- pytest-benchmark
Expand Down
2 changes: 1 addition & 1 deletion ci/environment-py3.13.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- scikit-learn
- xarray
- xesmf
- xoak
# - xoak
# - xroms
- pytest
- pytest-benchmark
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions environment-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
# - [email protected]:xarray-contrib/cf-xarray.git
2 changes: 1 addition & 1 deletion extract_model/extract_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading