Skip to content

Commit b085d8b

Browse files
authored
Refactor compatibility modules into xarray.compat package (pydata#10131)
Start of pydata#10089 Move compatibility-related modules from xarray.core to new xarray.compat package: - array_api_compat.py - dask_array_compat.py - dask_array_ops.py - npcompat.py - pdcompat.py
1 parent 5e0b2e7 commit b085d8b

16 files changed

+17
-15
lines changed

xarray/coding/cftime_offsets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
convert_time_or_go_back,
6262
format_cftime_datetime,
6363
)
64-
from xarray.core.common import _contains_datetime_like_objects, is_np_datetime_like
65-
from xarray.core.pdcompat import (
64+
from xarray.compat.pdcompat import (
6665
count_not_none,
6766
default_precision_timestamp,
6867
)
68+
from xarray.core.common import _contains_datetime_like_objects, is_np_datetime_like
6969
from xarray.core.types import InclusiveOptions
7070
from xarray.core.utils import attempt_import, emit_user_level_warning
7171

xarray/coding/times.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
unpack_for_decoding,
2121
unpack_for_encoding,
2222
)
23+
from xarray.compat.pdcompat import default_precision_timestamp, timestamp_as_unit
2324
from xarray.core import indexing
2425
from xarray.core.common import contains_cftime_datetimes, is_np_datetime_like
2526
from xarray.core.duck_array_ops import array_all, array_any, asarray, ravel, reshape
2627
from xarray.core.formatting import first_n_items, format_timestamp, last_item
27-
from xarray.core.pdcompat import default_precision_timestamp, timestamp_as_unit
2828
from xarray.core.utils import attempt_import, emit_user_level_warning
2929
from xarray.core.variable import Variable
3030
from xarray.namedarray.parallelcompat import T_ChunkedArray, get_chunked_array_type

xarray/compat/__init__.py

Whitespace-only changes.
File renamed without changes.
File renamed without changes.

xarray/core/dask_array_ops.py renamed to xarray/compat/dask_array_ops.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import math
44

5+
from xarray.compat.dask_array_compat import reshape_blockwise
56
from xarray.core import dtypes, nputils
67

78

@@ -21,8 +22,6 @@ def dask_rolling_wrapper(moving_func, a, window, min_count=None, axis=-1):
2122
def least_squares(lhs, rhs, rcond=None, skipna=False):
2223
import dask.array as da
2324

24-
from xarray.core.dask_array_compat import reshape_blockwise
25-
2625
# The trick here is that the core dimension is axis 0.
2726
# All other dimensions need to be reshaped down to one axis for `lstsq`
2827
# (which only accepts 2D input)
File renamed without changes.
File renamed without changes.

xarray/core/computation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import numpy as np
2424

25+
from xarray.compat.array_api_compat import to_like_array
2526
from xarray.core import dtypes, duck_array_ops, utils
2627
from xarray.core.alignment import align, deep_align
27-
from xarray.core.array_api_compat import to_like_array
2828
from xarray.core.common import zeros_like
2929
from xarray.core.duck_array_ops import datetime_to_numeric
3030
from xarray.core.formatting import limit_lines

xarray/core/dataset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
from xarray.coding.calendar_ops import convert_calendar, interp_calendar
4343
from xarray.coding.cftimeindex import CFTimeIndex, _parse_array_of_cftime_strings
44+
from xarray.compat.array_api_compat import to_like_array
4445
from xarray.core import (
4546
alignment,
4647
duck_array_ops,
@@ -57,7 +58,6 @@
5758
align,
5859
)
5960
from xarray.core.arithmetic import DatasetArithmetic
60-
from xarray.core.array_api_compat import to_like_array
6161
from xarray.core.common import (
6262
DataWithCoords,
6363
_contains_datetime_like_objects,

0 commit comments

Comments
 (0)