Skip to content

Commit 7a6a16f

Browse files
authored
Merge branch 'main' into cumulative
2 parents 494385b + 7c1bb8d commit 7a6a16f

Some content is hidden

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

46 files changed

+1707
-274
lines changed

.github/labeler.yml

Lines changed: 0 additions & 85 deletions
This file was deleted.

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
benchmark:
10-
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' }}
10+
if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
1111
name: Linux
1212
runs-on: ubuntu-20.04
1313
env:

.github/workflows/label-all.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/label-prs.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.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].10
91+
uses: pypa/[email protected].11
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].10
114+
uses: pypa/[email protected].11
115115
with:
116116
verbose: true

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ repos:
1818
files: ^xarray/
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
2020
# Ruff version.
21-
rev: 'v0.1.4'
21+
rev: 'v0.1.6'
2222
hooks:
2323
- id: ruff
2424
args: ["--fix"]
2525
# https://github.com/python/black#version-control-integration
2626
- repo: https://github.com/psf/black
27-
rev: 23.10.1
27+
rev: 23.11.0
2828
hooks:
2929
- id: black-jupyter
3030
- repo: https://github.com/keewis/blackdoc
3131
rev: v0.3.9
3232
hooks:
3333
- id: blackdoc
3434
exclude: "generate_aggregations.py"
35-
additional_dependencies: ["black==23.10.1"]
35+
additional_dependencies: ["black==23.11.0"]
3636
- id: blackdoc-autoupdate-black
3737
- repo: https://github.com/pre-commit/mirrors-mypy
38-
rev: v1.6.1
38+
rev: v1.7.1
3939
hooks:
4040
- id: mypy
4141
# Copied from setup.cfg

ci/requirements/doc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies:
99
- cartopy
1010
- cfgrib
1111
- dask-core>=2022.1
12+
- hypothesis>=6.75.8
1213
- h5netcdf>=0.13
1314
- ipykernel
1415
- ipywidgets # silence nbsphinx warning

doc/api.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ Computation
193193
Dataset.map_blocks
194194
Dataset.polyfit
195195
Dataset.curvefit
196+
Dataset.eval
196197

197198
Aggregation
198199
-----------
@@ -1071,6 +1072,27 @@ Testing
10711072
testing.assert_allclose
10721073
testing.assert_chunks_equal
10731074

1075+
Hypothesis Testing Strategies
1076+
=============================
1077+
1078+
.. currentmodule:: xarray
1079+
1080+
See the :ref:`documentation page on testing <testing.hypothesis>` for a guide on how to use these strategies.
1081+
1082+
.. warning::
1083+
These strategies should be considered highly experimental, and liable to change at any time.
1084+
1085+
.. autosummary::
1086+
:toctree: generated/
1087+
1088+
testing.strategies.supported_dtypes
1089+
testing.strategies.names
1090+
testing.strategies.dimension_names
1091+
testing.strategies.dimension_sizes
1092+
testing.strategies.attrs
1093+
testing.strategies.variables
1094+
testing.strategies.unique_subset_of
1095+
10741096
Exceptions
10751097
==========
10761098

doc/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@
326326
"dask": ("https://docs.dask.org/en/latest", None),
327327
"cftime": ("https://unidata.github.io/cftime", None),
328328
"sparse": ("https://sparse.pydata.org/en/latest/", None),
329+
"hypothesis": ("https://hypothesis.readthedocs.io/en/latest/", None),
329330
"cubed": ("https://tom-e-white.com/cubed/", None),
330331
"datatree": ("https://xarray-datatree.readthedocs.io/en/latest/", None),
331332
"xarray-tutorial": ("https://tutorial.xarray.dev/", None),

doc/gallery/plot_cartopy_facetgrid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
transform=ccrs.PlateCarree(), # the data's projection
3131
col="time",
3232
col_wrap=1, # multiplot settings
33-
aspect=ds.dims["lon"] / ds.dims["lat"], # for a sensible figsize
33+
aspect=ds.sizes["lon"] / ds.sizes["lat"], # for a sensible figsize
3434
subplot_kws={"projection": map_proj}, # the plot's projection
3535
)
3636

0 commit comments

Comments
 (0)