Skip to content

Commit e96e70e

Browse files
andersy005andersy005
committed
Merge branch 'main' into backend-indexing
2 parents 10c133b + 08e43b9 commit e96e70e

Some content is hidden

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

80 files changed

+2404
-1971
lines changed

‎.binder/environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ dependencies:
2828
- pip
2929
- pooch
3030
- pydap
31-
- pynio
3231
- rasterio
3332
- scipy
3433
- seaborn

‎.github/workflows/ci-additional.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
shell: bash -l {0}
4444
env:
4545
CONDA_ENV_FILE: ci/requirements/environment.yml
46-
PYTHON_VERSION: "3.11"
46+
PYTHON_VERSION: "3.12"
4747
steps:
4848
- uses: actions/checkout@v4
4949
with:
@@ -129,7 +129,7 @@ jobs:
129129
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report xarray/
130130
131131
- name: Upload mypy coverage to Codecov
132-
uses: codecov/codecov-action@v4.2.0
132+
uses: codecov/codecov-action@v4.3.0
133133
with:
134134
file: mypy_report/cobertura.xml
135135
flags: mypy
@@ -183,7 +183,7 @@ jobs:
183183
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report xarray/
184184
185185
- name: Upload mypy coverage to Codecov
186-
uses: codecov/codecov-action@v4.2.0
186+
uses: codecov/codecov-action@v4.3.0
187187
with:
188188
file: mypy_report/cobertura.xml
189189
flags: mypy39
@@ -207,7 +207,7 @@ jobs:
207207
shell: bash -l {0}
208208
env:
209209
CONDA_ENV_FILE: ci/requirements/environment.yml
210-
PYTHON_VERSION: "3.10"
210+
PYTHON_VERSION: "3.12"
211211

212212
steps:
213213
- uses: actions/checkout@v4
@@ -244,7 +244,7 @@ jobs:
244244
python -m pyright xarray/
245245
246246
- name: Upload pyright coverage to Codecov
247-
uses: codecov/codecov-action@v4.2.0
247+
uses: codecov/codecov-action@v4.3.0
248248
with:
249249
file: pyright_report/cobertura.xml
250250
flags: pyright
@@ -303,7 +303,7 @@ jobs:
303303
python -m pyright xarray/
304304
305305
- name: Upload pyright coverage to Codecov
306-
uses: codecov/codecov-action@v4.2.0
306+
uses: codecov/codecov-action@v4.3.0
307307
with:
308308
file: pyright_report/cobertura.xml
309309
flags: pyright39
@@ -332,7 +332,7 @@ jobs:
332332
with:
333333
environment-name: xarray-tests
334334
create-args: >-
335-
python=3.11
335+
python=3.12
336336
pyyaml
337337
conda
338338
python-dateutil

‎.github/workflows/ci.yaml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
matrix:
4747
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
4848
# Bookend python versions
49-
python-version: ["3.9", "3.11", "3.12"]
49+
python-version: ["3.9", "3.12"]
5050
env: [""]
5151
include:
5252
# Minimum python version:
@@ -58,10 +58,11 @@ jobs:
5858
os: ubuntu-latest
5959
# Latest python version:
6060
- env: "all-but-dask"
61-
python-version: "3.10"
61+
# Not 3.12 because of pint
62+
python-version: "3.11"
6263
os: ubuntu-latest
6364
- env: "flaky"
64-
python-version: "3.10"
65+
python-version: "3.12"
6566
os: ubuntu-latest
6667
steps:
6768
- uses: actions/checkout@v4
@@ -73,25 +74,30 @@ jobs:
7374
7475
if [[ ${{ matrix.os }} == windows* ]] ;
7576
then
76-
if [[ ${{ matrix.python-version }} != "3.12" ]]; then
77+
if [[ ${{ matrix.python-version }} != "3.13" ]]; then
7778
echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
7879
else
79-
echo "CONDA_ENV_FILE=ci/requirements/environment-windows-3.12.yml" >> $GITHUB_ENV
80+
echo "CONDA_ENV_FILE=ci/requirements/environment-windows-3.13.yml" >> $GITHUB_ENV
8081
fi
8182
elif [[ "${{ matrix.env }}" != "" ]] ;
8283
then
8384
if [[ "${{ matrix.env }}" == "flaky" ]] ;
8485
then
8586
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
86-
echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
87+
echo "PYTEST_ADDOPTS=-m 'flaky or network' --run-flaky --run-network-tests -W default" >> $GITHUB_ENV
8788
else
8889
echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
8990
fi
91+
if [[ "${{ matrix.env }}" == "min-all-deps" ]] ;
92+
then
93+
# Don't raise on warnings
94+
echo "PYTEST_ADDOPTS=-W default" >> $GITHUB_ENV
95+
fi
9096
else
91-
if [[ ${{ matrix.python-version }} != "3.12" ]]; then
97+
if [[ ${{ matrix.python-version }} != "3.13" ]]; then
9298
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
9399
else
94-
echo "CONDA_ENV_FILE=ci/requirements/environment-3.12.yml" >> $GITHUB_ENV
100+
echo "CONDA_ENV_FILE=ci/requirements/environment-3.13.yml" >> $GITHUB_ENV
95101
fi
96102
fi
97103
@@ -111,7 +117,7 @@ jobs:
111117
# We only want to install this on one run, because otherwise we'll have
112118
# duplicate annotations.
113119
- name: Install error reporter
114-
if: ${{ matrix.os }} == 'ubuntu-latest' and ${{ matrix.python-version }} == '3.10'
120+
if: ${{ matrix.os }} == 'ubuntu-latest' and ${{ matrix.python-version }} == '3.12'
115121
run: |
116122
python -m pip install pytest-github-actions-annotate-failures
117123
@@ -143,7 +149,6 @@ jobs:
143149
--cov=xarray
144150
--cov-report=xml
145151
--junitxml=pytest.xml
146-
$PYTEST_EXTRA_FLAGS
147152

148153
- name: Upload test results
149154
if: always()
@@ -153,7 +158,7 @@ jobs:
153158
path: pytest.xml
154159

155160
- name: Upload code coverage to Codecov
156-
uses: codecov/codecov-action@v4.2.0
161+
uses: codecov/codecov-action@v4.3.0
157162
with:
158163
file: ./coverage.xml
159164
flags: unittests

‎.github/workflows/pypi-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-python@v5
1919
name: Install Python
2020
with:
21-
python-version: "3.11"
21+
python-version: "3.12"
2222

2323
- name: Install dependencies
2424
run: |
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/setup-python@v5
5454
name: Install Python
5555
with:
56-
python-version: "3.11"
56+
python-version: "3.12"
5757
- uses: actions/download-artifact@v4
5858
with:
5959
name: releases

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.2.0
146+
uses: codecov/codecov-action@v4.3.0
147147
with:
148148
file: mypy_report/cobertura.xml
149149
flags: mypy

‎MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
prune xarray/datatree_*
2+
recursive-include xarray/datatree_/datatree *.py

‎ci/install-upstream-wheels.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env bash
22

33
# install cython for building cftime without build isolation
4-
micromamba install "cython>=0.29.20" py-cpuinfo
4+
micromamba install "cython>=0.29.20" py-cpuinfo setuptools-scm
55
# temporarily (?) remove numbagg and numba
66
micromamba remove -y numba numbagg sparse
77
# temporarily remove numexpr
88
micromamba remove -y numexpr
99
# temporarily remove backends
10-
micromamba remove -y cf_units hdf5 h5py netcdf4
10+
micromamba remove -y cf_units hdf5 h5py netcdf4 pydap
1111
# forcibly remove packages to avoid artifacts
1212
micromamba remove -y --force \
1313
numpy \
@@ -31,7 +31,8 @@ python -m pip install \
3131
numpy \
3232
scipy \
3333
matplotlib \
34-
pandas
34+
pandas \
35+
h5py
3536
# for some reason pandas depends on pyarrow already.
3637
# Remove once a `pyarrow` version compiled with `numpy>=2.0` is on `conda-forge`
3738
python -m pip install \
@@ -70,6 +71,6 @@ python -m pip install \
7071
git+https://github.com/intake/filesystem_spec \
7172
git+https://github.com/SciTools/nc-time-axis \
7273
git+https://github.com/xarray-contrib/flox \
74+
git+https://github.com/h5netcdf/h5netcdf \
7375
git+https://github.com/dgasmith/opt_einsum
7476
# git+https://github.com/pydata/sparse
75-
# git+https://github.com/h5netcdf/h5netcdf

‎ci/requirements/bare-minimum.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ dependencies:
1212
- pytest-xdist
1313
- pytest-timeout
1414
- numpy=1.23
15-
- packaging=22.0
16-
- pandas=1.5
15+
- packaging=23.1
16+
- pandas=2.0

‎ci/requirements/doc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ dependencies:
3838
- sphinx-design
3939
- sphinx-inline-tabs
4040
- sphinx>=5.0
41+
- sphinxext-opengraph
42+
- sphinxext-rediraffe
4143
- zarr>=2.10
4244
- pip:
43-
- sphinxext-rediraffe
44-
- sphinxext-opengraph
4545
# relative to this file. Needs to be editable to be accepted.
4646
- -e ../..

‎ci/requirements/environment-3.12.yml renamed to ‎ci/requirements/environment-3.13.yml

File renamed without changes.

0 commit comments

Comments
 (0)