Skip to content

Commit e8fabc4

Browse files
committed
Merge remote-tracking branch 'upstream/master' into ufunc-vectorize-meta
* upstream/master: Add an example notebook using apply_ufunc to vectorize 1D functions (pydata#3629) Use encoding['dtype'] over data.dtype when possible within CFMaskCoder.encode (pydata#3652) allow passing any iterable to drop when dropping variables (pydata#3693) Typo on DataSet/DataArray.to_dict documentation (pydata#3692) Fix mypy type checking tests failure in ds.merge (pydata#3690) Explicitly convert result of pd.to_datetime to a timezone-naive type (pydata#3688) ds.merge(da) bugfix (pydata#3677) fix docstring for combine_first: returns a Dataset (pydata#3683) Add option to choose mfdataset attributes source. (pydata#3498) How do I add a new variable to dataset. (pydata#3679) Add map_blocks example to whats-new (pydata#3682) Make dask names change when chunking Variables by different amounts. (pydata#3584) raise an error when renaming dimensions to existing names (pydata#3645) Support swap_dims to dimension names that are not existing variables (pydata#3636) Add map_blocks example to docs. (pydata#3667) add multiindex level name checking to .rename() (pydata#3658)
2 parents c125300 + f8386be commit e8fabc4

19 files changed

+1020
-41
lines changed

ci/requirements/doc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
- jupyter_client
1515
- nbsphinx
1616
- netcdf4
17+
- numba
1718
- numpy
1819
- numpydoc
1920
- pandas<0.25 # Hack around https://github.com/pydata/xarray/issues/3369

doc/data-structures.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,8 @@ setting) variables and attributes:
353353
This is particularly useful in an exploratory context, because you can
354354
tab-complete these variable names with tools like IPython.
355355

356+
.. _dictionary_like_methods:
357+
356358
Dictionary like methods
357359
~~~~~~~~~~~~~~~~~~~~~~~
358360

doc/examples.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@ Examples
1010
examples/visualization_gallery
1111
examples/ROMS_ocean_model
1212
examples/ERA5-GRIB-example
13+
14+
Using apply_ufunc
15+
------------------
16+
.. toctree::
17+
:maxdepth: 2
18+
19+
examples/apply_ufunc_vectorize_1d

0 commit comments

Comments
 (0)