Skip to content

Commit d584657

Browse files
committed
Merge branch 'main' into depr-eagerly-compute-group
* main: Fix convert calendar on non-temporal data in datasets (pydata#10268) BinGrouper: reduce indirection (pydata#10270) Fix reduction by subset of grouper dimensions (pydata#10258) Shorten text repr for ``DataTree`` (pydata#10139) Fix benchmarks runners (pydata#10265) Fix infinite recursion when calling `np.fix` (pydata#10248) BinGrouper: Support setting labels when provided with IntervalIndex (pydata#10259) Avoid stacking when grouping by chunked array (pydata#10254) Improve alignment checks (pydata#10251) Update how-to-add-new-backend.rst (pydata#10240) Support extension array indexes (pydata#9671) Switch documentation to pydata-sphinx-theme (pydata#8708) Bump codecov/codecov-action from 5.4.0 to 5.4.2 in the actions group (pydata#10239)
2 parents aeae28d + d7a6f2b commit d584657

Some content is hidden

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

56 files changed

+1174
-1004
lines changed

.github/workflows/benchmarks-last-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
benchmark:
1111
name: Linux
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
env:
1414
ASV_DIR: "./asv_bench"
1515
CONDA_ENV_FILE: ci/requirements/environment.yml

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
benchmark:
1313
if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || contains( github.event.pull_request.labels.*.name, 'topic-performance') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
1414
name: Linux
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
env:
1717
ASV_DIR: "./asv_bench"
1818
CONDA_ENV_FILE: ci/requirements/environment.yml

.github/workflows/ci-additional.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
124124
125125
- name: Upload mypy coverage to Codecov
126-
uses: codecov/[email protected].0
126+
uses: codecov/[email protected].2
127127
with:
128128
file: mypy_report/cobertura.xml
129129
flags: mypy
@@ -174,7 +174,7 @@ jobs:
174174
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
175175
176176
- name: Upload mypy coverage to Codecov
177-
uses: codecov/[email protected].0
177+
uses: codecov/[email protected].2
178178
with:
179179
file: mypy_report/cobertura.xml
180180
flags: mypy-min
@@ -230,7 +230,7 @@ jobs:
230230
python -m pyright xarray/
231231
232232
- name: Upload pyright coverage to Codecov
233-
uses: codecov/[email protected].0
233+
uses: codecov/[email protected].2
234234
with:
235235
file: pyright_report/cobertura.xml
236236
flags: pyright
@@ -286,7 +286,7 @@ jobs:
286286
python -m pyright xarray/
287287
288288
- name: Upload pyright coverage to Codecov
289-
uses: codecov/[email protected].0
289+
uses: codecov/[email protected].2
290290
with:
291291
file: pyright_report/cobertura.xml
292292
flags: pyright39

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
path: pytest.xml
173173

174174
- name: Upload code coverage to Codecov
175-
uses: codecov/[email protected].0
175+
uses: codecov/[email protected].2
176176
env:
177177
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
178178
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
run: |
141141
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
142142
- name: Upload mypy coverage to Codecov
143-
uses: codecov/[email protected].0
143+
uses: codecov/[email protected].2
144144
with:
145145
file: mypy_report/cobertura.xml
146146
flags: mypy

ci/requirements/doc.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,50 @@ channels:
44
- conda-forge
55
- nodefaults
66
dependencies:
7-
- python=3.12
7+
- python
88
- bottleneck
99
- cartopy
1010
- cfgrib
1111
- kerchunk
12-
- dask-core>=2022.1
13-
- hypothesis>=6.75.8
14-
- h5netcdf>=0.13
12+
- dask-core
13+
- hypothesis
14+
- h5netcdf
1515
- ipykernel
1616
- ipywidgets # silence nbsphinx warning
1717
- ipython
18-
- iris>=2.3
18+
- iris
1919
- jupyter_client
20+
- jupyter_sphinx
2021
- matplotlib-base
2122
- nbsphinx
2223
- ncdata
23-
- netcdf4>=1.5
24+
- netcdf4
2425
- numba
2526
- numpy>=2
26-
- packaging>=23.2
27-
- pandas>=1.4,!=2.1.0
27+
- packaging
28+
- pandas
2829
- pooch
2930
- pip
3031
- pre-commit
3132
- pyarrow
33+
- pydata-sphinx-theme
3234
- pyproj
3335
- rich # for Zarr tree()
34-
- scipy!=1.10.0
36+
- scipy
3537
- seaborn
3638
- setuptools
3739
- sparse
3840
- sphinx-autosummary-accessors
39-
- sphinx-book-theme<=1.0.1
4041
- sphinx-copybutton
4142
- sphinx-design
4243
- sphinx-inline-tabs
43-
- sphinx>=5.0,<7.0 # https://github.com/executablebooks/sphinx-book-theme/issues/749
44+
- sphinx>=6,<8
45+
- sphinxcontrib-mermaid
4446
- sphinxcontrib-srclinks
4547
- sphinx-remove-toctrees
4648
- sphinxext-opengraph
4749
- sphinxext-rediraffe
48-
- zarr>=2.10
50+
- zarr
4951
- pip:
50-
- sphinxcontrib-mermaid
5152
# relative to this file. Needs to be editable to be accepted.
5253
- -e ../..

0 commit comments

Comments
 (0)