Skip to content
/ xarray Public
forked from pydata/xarray

Commit 3c92ddf

Browse files
dcheriandcherian
committed
Merge branch 'main' into state-machine
* main: (31 commits) correctly encode/decode _FillValues/missing_values/dtypes for packed data (pydata#8713) Expand use of `.oindex` and `.vindex` (pydata#8790) Return a dataclass from Grouper.factorize (pydata#8777) [skip-ci] Fix upstream-dev env (pydata#8839) Add dask-expr for windows envs (pydata#8837) [skip-ci] Add dask-expr dependency to doc.yml (pydata#8835) Add `dask-expr` to environment-3.12.yml (pydata#8827) Make list_chunkmanagers more resilient to broken entrypoints (pydata#8736) Do not attempt to broadcast when global option ``arithmetic_broadcast=False`` (pydata#8784) try to get the `upstream-dev` CI to complete again (pydata#8823) Bump the actions group with 1 update (pydata#8818) Update documentation for clarity (pydata#8817) DOC: link to zarr.convenience.consolidate_metadata (pydata#8816) Refactor Grouper objects (pydata#8776) Grouper object design doc (pydata#8510) Bump the actions group with 2 updates (pydata#8804) tokenize() should ignore difference between None and {} attrs (pydata#8797) fix: remove Coordinate from __all__ in xarray/__init__.py (pydata#8791) Fix non-nanosecond casting behavior for `expand_dims` (pydata#8782) Migrate treenode module. (pydata#8757) ...
2 parents 88e2010 + fbcac76 commit 3c92ddf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1914
-836
lines changed

‎.github/workflows/ci-additional.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report xarray/
129129
130130
- name: Upload mypy coverage to Codecov
131-
uses: codecov/codecov-action@v4.0.1
131+
uses: codecov/codecov-action@v4.1.0
132132
with:
133133
file: mypy_report/cobertura.xml
134134
flags: mypy
@@ -182,7 +182,7 @@ jobs:
182182
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report xarray/
183183
184184
- name: Upload mypy coverage to Codecov
185-
uses: codecov/codecov-action@v4.0.1
185+
uses: codecov/codecov-action@v4.1.0
186186
with:
187187
file: mypy_report/cobertura.xml
188188
flags: mypy39
@@ -243,7 +243,7 @@ jobs:
243243
python -m pyright xarray/
244244
245245
- name: Upload pyright coverage to Codecov
246-
uses: codecov/codecov-action@v4.0.1
246+
uses: codecov/codecov-action@v4.1.0
247247
with:
248248
file: pyright_report/cobertura.xml
249249
flags: pyright
@@ -302,7 +302,7 @@ jobs:
302302
python -m pyright xarray/
303303
304304
- name: Upload pyright coverage to Codecov
305-
uses: codecov/codecov-action@v4.0.1
305+
uses: codecov/codecov-action@v4.1.0
306306
with:
307307
file: pyright_report/cobertura.xml
308308
flags: pyright39

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
path: pytest.xml
144144

145145
- name: Upload code coverage to Codecov
146-
uses: codecov/codecov-action@v4.0.1
146+
uses: codecov/codecov-action@v4.1.0
147147
with:
148148
file: ./coverage.xml
149149
flags: unittests

‎.github/workflows/nightly-wheels.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fi
3939
4040
- name: Upload wheel
41-
uses: scientific-python/upload-nightly-action@6e9304f7a3a5501c6f98351537493ec898728299 # 0.3.0
41+
uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
4242
with:
4343
anaconda_nightly_upload_token: ${{ secrets.ANACONDA_NIGHTLY }}
4444
artifacts_path: dist

‎.github/workflows/pypi-release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
path: dist
8989
- name: Publish package to TestPyPI
9090
if: github.event_name == 'push'
91-
uses: pypa/[email protected].11
91+
uses: pypa/[email protected].14
9292
with:
9393
repository_url: https://test.pypi.org/legacy/
9494
verbose: true
@@ -111,6 +111,6 @@ jobs:
111111
name: releases
112112
path: dist
113113
- name: Publish package to PyPI
114-
uses: pypa/[email protected].11
114+
uses: pypa/[email protected].14
115115
with:
116116
verbose: true

‎.github/workflows/upstream-dev-ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
fail-fast: false
5454
matrix:
55-
python-version: ["3.11"]
55+
python-version: ["3.12"]
5656
steps:
5757
- uses: actions/checkout@v4
5858
with:
@@ -143,7 +143,7 @@ jobs:
143143
run: |
144144
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
145145
- name: Upload mypy coverage to Codecov
146-
uses: codecov/codecov-action@v4.0.1
146+
uses: codecov/codecov-action@v4.1.0
147147
with:
148148
file: mypy_report/cobertura.xml
149149
flags: mypy

‎ci/install-upstream-wheels.sh

+17-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
# install cython for building cftime without build isolation
44
micromamba install "cython>=0.29.20" py-cpuinfo
55
# temporarily (?) remove numbagg and numba
6-
micromamba remove -y numba numbagg
6+
micromamba remove -y numba numbagg sparse
7+
# temporarily remove numexpr
8+
micromamba remove -y numexpr
79
# temporarily remove backends
8-
micromamba remove -y cf_units h5py hdf5 netcdf4
10+
micromamba remove -y cf_units hdf5 h5py netcdf4
911
# forcibly remove packages to avoid artifacts
10-
conda uninstall -y --force \
12+
micromamba remove -y --force \
1113
numpy \
1214
scipy \
1315
pandas \
@@ -30,8 +32,17 @@ python -m pip install \
3032
scipy \
3133
matplotlib \
3234
pandas
35+
# for some reason pandas depends on pyarrow already.
36+
# Remove once a `pyarrow` version compiled with `numpy>=2.0` is on `conda-forge`
37+
python -m pip install \
38+
-i https://pypi.fury.io/arrow-nightlies/ \
39+
--prefer-binary \
40+
--no-deps \
41+
--pre \
42+
--upgrade \
43+
pyarrow
3344
# without build isolation for packages compiling against numpy
34-
# TODO: remove once there are `numpy>=2.0` builds for numcodecs and cftime
45+
# TODO: remove once there are `numpy>=2.0` builds for these
3546
python -m pip install \
3647
--no-deps \
3748
--upgrade \
@@ -51,13 +62,14 @@ python -m pip install \
5162
--no-deps \
5263
--upgrade \
5364
git+https://github.com/dask/dask \
65+
git+https://github.com/dask/dask-expr \
5466
git+https://github.com/dask/distributed \
5567
git+https://github.com/zarr-developers/zarr \
5668
git+https://github.com/pypa/packaging \
5769
git+https://github.com/hgrecco/pint \
58-
git+https://github.com/pydata/sparse \
5970
git+https://github.com/intake/filesystem_spec \
6071
git+https://github.com/SciTools/nc-time-axis \
6172
git+https://github.com/xarray-contrib/flox \
6273
git+https://github.com/dgasmith/opt_einsum
74+
# git+https://github.com/pydata/sparse
6375
# git+https://github.com/h5netcdf/h5netcdf

‎ci/requirements/all-but-dask.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ channels:
55
dependencies:
66
- black
77
- aiobotocore
8+
- array-api-strict
89
- boto3
910
- bottleneck
1011
- cartopy

‎ci/requirements/doc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies:
99
- cartopy
1010
- cfgrib
1111
- dask-core>=2022.1
12+
- dask-expr
1213
- hypothesis>=6.75.8
1314
- h5netcdf>=0.13
1415
- ipykernel

‎ci/requirements/environment-3.12.yml

+2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ channels:
44
- nodefaults
55
dependencies:
66
- aiobotocore
7+
- array-api-strict
78
- boto3
89
- bottleneck
910
- cartopy
1011
- cftime
1112
- dask-core
13+
- dask-expr
1214
- distributed
1315
- flox
1416
- fsspec

‎ci/requirements/environment-windows-3.12.yml

+2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ name: xarray-tests
22
channels:
33
- conda-forge
44
dependencies:
5+
- array-api-strict
56
- boto3
67
- bottleneck
78
- cartopy
89
- cftime
910
- dask-core
11+
- dask-expr
1012
- distributed
1113
- flox
1214
- fsspec

‎ci/requirements/environment-windows.yml

+2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ name: xarray-tests
22
channels:
33
- conda-forge
44
dependencies:
5+
- array-api-strict
56
- boto3
67
- bottleneck
78
- cartopy
89
- cftime
910
- dask-core
11+
- dask-expr
1012
- distributed
1113
- flox
1214
- fsspec

‎ci/requirements/environment.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ channels:
44
- nodefaults
55
dependencies:
66
- aiobotocore
7+
- array-api-strict
78
- boto3
89
- bottleneck
910
- cartopy

‎ci/requirements/min-all-deps.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies:
88
# When upgrading python, numpy, or pandas, must also change
99
# doc/user-guide/installing.rst, doc/user-guide/plotting.rst and setup.py.
1010
- python=3.9
11+
- array-api-strict=1.0 # dependency for testing the array api compat
1112
- boto3=1.24
1213
- bottleneck=1.3
1314
- cartopy=0.21

0 commit comments

Comments
 (0)