Skip to content

Commit 46e81b3

Browse files
dcheriandcherian
committed
Merge branch 'main' into flox-first-last
* main: (67 commits) Refactor datetime and timedelta encoding for increased robustness (pydata#9498) Fix test_distributed::test_async (pydata#10138) Refactor concat / combine / merge into `xarray/structure` (pydata#10134) Split `apply_ufunc` out of `computation.py` (pydata#10133) Refactor modules from `core` into `xarray.computation` (pydata#10132) Refactor compatibility modules into xarray.compat package (pydata#10131) Fix type issues from pandas stubs (pydata#10128) Don't skip tests when on a `mypy` branch (pydata#10129) Change `python_files` in `pyproject.toml` to a list (pydata#10127) Better `uv` compatibility (pydata#10124) explicitly cast the dtype of `where`'s condition parameter to `bool` (pydata#10087) Use `to_numpy` in time decoding (pydata#10081) Pin pandas stubs (pydata#10119) Fix broken Zarr test (pydata#10109) Update asv badge url in README.md (pydata#10113) fix and supress some test warnings (pydata#10104) Improve handling of dtype and NaT when encoding/decoding masked and packaged datetimes and timedeltas (pydata#10050) Ensure KeyError raised for zarr datasets missing dim names (pydata#10025) Add typos check to pre-commit hooks (pydata#10040) Bump codecov/codecov-action from 5.3.1 to 5.4.0 in the actions group (pydata#10090) ...
2 parents 37eff5a + e6eabca commit 46e81b3

File tree

140 files changed

+5903
-2942
lines changed

Some content is hidden

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

140 files changed

+5903
-2942
lines changed

‎.github/workflows/ci-additional.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ jobs:
116116
python xarray/util/print_versions.py
117117
- name: Install mypy
118118
run: |
119-
python -m pip install "mypy==1.13" --force-reinstall
119+
python -m pip install "mypy==1.15" --force-reinstall
120120
121121
- name: Run mypy
122122
run: |
123123
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
124124
125125
- name: Upload mypy coverage to Codecov
126-
uses: codecov/codecov-action@v5.1.2
126+
uses: codecov/codecov-action@v5.4.0
127127
with:
128128
file: mypy_report/cobertura.xml
129129
flags: mypy
@@ -167,14 +167,14 @@ jobs:
167167
python xarray/util/print_versions.py
168168
- name: Install mypy
169169
run: |
170-
python -m pip install "mypy==1.13" --force-reinstall
170+
python -m pip install "mypy==1.15" --force-reinstall
171171
172172
- name: Run mypy
173173
run: |
174174
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
175175
176176
- name: Upload mypy coverage to Codecov
177-
uses: codecov/codecov-action@v5.1.2
177+
uses: codecov/codecov-action@v5.4.0
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/codecov-action@v5.1.2
233+
uses: codecov/codecov-action@v5.4.0
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/codecov-action@v5.1.2
289+
uses: codecov/codecov-action@v5.4.0
290290
with:
291291
file: pyright_report/cobertura.xml
292292
flags: pyright39

‎.github/workflows/ci.yaml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
matrix:
4848
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
4949
# Bookend python versions
50-
python-version: ["3.10", "3.12"]
50+
python-version: ["3.10", "3.13"]
5151
env: [""]
5252
include:
5353
# Minimum python version:
@@ -59,14 +59,23 @@ jobs:
5959
os: ubuntu-latest
6060
# Latest python version:
6161
- env: "all-but-numba"
62-
python-version: "3.12"
62+
python-version: "3.13"
6363
os: ubuntu-latest
6464
- env: "all-but-dask"
65-
# Not 3.12 because of pint
66-
python-version: "3.11"
65+
python-version: "3.12"
6766
os: ubuntu-latest
6867
- env: "flaky"
69-
python-version: "3.12"
68+
python-version: "3.13"
69+
os: ubuntu-latest
70+
# The mypy tests must be executed using only 1 process in order to guarantee
71+
# predictable mypy output messages for comparison to expectations.
72+
- env: "mypy"
73+
python-version: "3.10"
74+
numprocesses: 1
75+
os: ubuntu-latest
76+
- env: "mypy"
77+
python-version: "3.13"
78+
numprocesses: 1
7079
os: ubuntu-latest
7180
steps:
7281
- uses: actions/checkout@v4
@@ -78,17 +87,21 @@ jobs:
7887
7988
if [[ ${{ matrix.os }} == windows* ]] ;
8089
then
81-
if [[ ${{ matrix.python-version }} != "3.13" ]]; then
90+
if [[ ${{ matrix.python-version }} != "3.14" ]]; then
8291
echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
8392
else
84-
echo "CONDA_ENV_FILE=ci/requirements/environment-windows-3.13.yml" >> $GITHUB_ENV
93+
echo "CONDA_ENV_FILE=ci/requirements/environment-windows-3.14.yml" >> $GITHUB_ENV
8594
fi
8695
elif [[ "${{ matrix.env }}" != "" ]] ;
8796
then
8897
if [[ "${{ matrix.env }}" == "flaky" ]] ;
8998
then
9099
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
91100
echo "PYTEST_ADDOPTS=-m 'flaky or network' --run-flaky --run-network-tests -W default" >> $GITHUB_ENV
101+
elif [[ "${{ matrix.env }}" == "mypy" ]] ;
102+
then
103+
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
104+
echo "PYTEST_ADDOPTS=-n 1 -m 'mypy' --run-mypy -W default" >> $GITHUB_ENV
92105
else
93106
echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
94107
fi
@@ -98,10 +111,10 @@ jobs:
98111
echo "PYTEST_ADDOPTS=-W default" >> $GITHUB_ENV
99112
fi
100113
else
101-
if [[ ${{ matrix.python-version }} != "3.13" ]]; then
114+
if [[ ${{ matrix.python-version }} != "3.14" ]]; then
102115
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
103116
else
104-
echo "CONDA_ENV_FILE=ci/requirements/environment-3.13.yml" >> $GITHUB_ENV
117+
echo "CONDA_ENV_FILE=ci/requirements/environment-3.14.yml" >> $GITHUB_ENV
105118
fi
106119
fi
107120
@@ -145,7 +158,7 @@ jobs:
145158
save-always: true
146159

147160
- name: Run tests
148-
run: python -m pytest -n 4
161+
run: python -m pytest -n ${{ matrix.numprocesses || 4 }}
149162
--timeout 180
150163
--cov=xarray
151164
--cov-report=xml
@@ -159,7 +172,7 @@ jobs:
159172
path: pytest.xml
160173

161174
- name: Upload code coverage to Codecov
162-
uses: codecov/codecov-action@v5.1.2
175+
uses: codecov/codecov-action@v5.4.0
163176
env:
164177
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
165178
with:

‎.github/workflows/pypi-release.yaml‎

Lines changed: 2 additions & 2 deletions
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].3
91+
uses: pypa/[email protected].4
9292
with:
9393
repository_url: https://test.pypi.org/legacy/
9494
verbose: true
@@ -110,6 +110,6 @@ jobs:
110110
name: releases
111111
path: dist
112112
- name: Publish package to PyPI
113-
uses: pypa/[email protected].3
113+
uses: pypa/[email protected].4
114114
with:
115115
verbose: true

‎.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/codecov-action@v5.1.2
143+
uses: codecov/codecov-action@v5.4.0
144144
with:
145145
file: mypy_report/cobertura.xml
146146
flags: mypy

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,8 @@ doc/team-panel.txt
8181
doc/external-examples-gallery.txt
8282
doc/notebooks-examples-gallery.txt
8383
doc/videos-gallery.txt
84+
85+
# Until we support this properly, excluding from gitignore. (adding it to
86+
# gitignore to make it _easier_ to work with `uv`, not as an indication that I
87+
# think we shouldn't...)
88+
uv.lock

‎.pre-commit-config.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
- id: text-unicode-replacement-char
2626
- repo: https://github.com/astral-sh/ruff-pre-commit
2727
# Ruff version.
28-
rev: v0.8.6
28+
rev: v0.9.9
2929
hooks:
3030
- id: ruff-format
3131
- id: ruff
@@ -37,12 +37,12 @@ repos:
3737
exclude: "generate_aggregations.py"
3838
additional_dependencies: ["black==24.8.0"]
3939
- repo: https://github.com/rbubley/mirrors-prettier
40-
rev: v3.4.2
40+
rev: v3.5.3
4141
hooks:
4242
- id: prettier
4343
args: [--cache-location=.prettier_cache/cache]
4444
- repo: https://github.com/pre-commit/mirrors-mypy
45-
rev: v1.14.1
45+
rev: v1.15.0
4646
hooks:
4747
- id: mypy
4848
# Copied from setup.cfg
@@ -73,3 +73,9 @@ repos:
7373
hooks:
7474
- id: validate-pyproject
7575
additional_dependencies: ["validate-pyproject-schema-store[all]"]
76+
- repo: https://github.com/crate-ci/typos
77+
rev: dictgen-v0.3.1
78+
hooks:
79+
- id: typos
80+
# https://github.com/crate-ci/typos/issues/347
81+
pass_filenames: false

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![CI](https://github.com/pydata/xarray/workflows/CI/badge.svg?branch=main)](https://github.com/pydata/xarray/actions?query=workflow%3ACI)
44
[![Code coverage](https://codecov.io/gh/pydata/xarray/branch/main/graph/badge.svg?flag=unittests)](https://codecov.io/gh/pydata/xarray)
55
[![Docs](https://readthedocs.org/projects/xray/badge/?version=latest)](https://docs.xarray.dev/)
6-
[![Benchmarked with asv](https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](https://pandas.pydata.org/speed/xarray/)
6+
[![Benchmarked with asv](https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](https://asv-runner.github.io/asv-collection/xarray/)
77
[![Formatted with black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
88
[![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
99
[![Available on pypi](https://img.shields.io/pypi/v/xarray.svg)](https://pypi.python.org/pypi/xarray/)

‎ci/minimum_versions.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
"pytest",
2727
"pytest-cov",
2828
"pytest-env",
29-
"pytest-xdist",
29+
"pytest-mypy-plugins",
3030
"pytest-timeout",
31+
"pytest-xdist",
3132
"hypothesis",
3233
]
3334

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ dependencies:
3030
- pytest
3131
- pytest-cov
3232
- pytest-env
33-
- pytest-xdist
33+
- pytest-mypy-plugins
3434
- pytest-timeout
35+
- pytest-xdist
3536
- rasterio
3637
- scipy
3738
- seaborn

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ dependencies:
4343
- pytest
4444
- pytest-cov
4545
- pytest-env
46-
- pytest-xdist
46+
- pytest-mypy-plugins
4747
- pytest-timeout
48+
- pytest-xdist
4849
- rasterio
4950
- scipy
5051
- seaborn

0 commit comments

Comments
 (0)