Skip to content

Commit 3137cea

Browse files
authored
Merge branch 'main' into codeautolink
2 parents 854eb2c + 5183bb7 commit 3137cea

File tree

7 files changed

+9
-11
lines changed

7 files changed

+9
-11
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: double-quote-string-fixer
1414

1515
- repo: https://github.com/psf/black
16-
rev: 22.12.0
16+
rev: 23.1.0
1717
hooks:
1818
- id: black
1919
- id: black-jupyter
@@ -33,12 +33,12 @@ repos:
3333
hooks:
3434
- id: seed-isort-config
3535
- repo: https://github.com/PyCQA/isort
36-
rev: 5.11.4
36+
rev: 5.12.0
3737
hooks:
3838
- id: isort
3939

4040
- repo: https://github.com/pre-commit/mirrors-prettier
41-
rev: v3.0.0-alpha.4
41+
rev: v3.0.0-alpha.6
4242
hooks:
4343
- id: prettier
4444

advanced/apply_ufunc/vectorize_1d.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@
602602
"\n",
603603
"\n",
604604
"def xr_interp(data, dim, newdim):\n",
605-
"\n",
606605
" interped = xr.apply_ufunc(\n",
607606
" interp1d_np_gufunc, # first the function\n",
608607
" data, # now arguments in the order expected by 'interp1_np'\n",

advanced/backends/2.Backend_with_Lazy_Loading.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
" )\n",
112112
"\n",
113113
" def _raw_indexing_method(self, key: tuple):\n",
114-
"\n",
115114
" key0 = key[0]\n",
116115
" size = np.dtype(self.dtype).itemsize\n",
117116
"\n",

fundamentals/03.3_windowed.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
"display(\"center=True\")\n",
214214
"display(simple.rolling(time=5, center=True).construct(\"window\"))\n",
215215
"\n",
216-
"display(\"center=True\")\n",
216+
"display(\"center=False\")\n",
217217
"display(simple.rolling(time=5, center=False).construct(\"window\"))"
218218
]
219219
},

intermediate/01-high-level-computation-patterns.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
"outputs": [],
323323
"source": [
324324
"# exactly equivalent to data.rolling(...).mean()\n",
325-
"data.rolling(lat=5, lon=5, center=True).reduce(np.ptp).plot()"
325+
"data.rolling(lat=5, lon=5, center=True).reduce(np.mean).plot()"
326326
]
327327
},
328328
{
@@ -526,7 +526,7 @@
526526
},
527527
"outputs": [],
528528
"source": [
529-
"(data.coarsen(lat=5, lon=5, boundary=\"trim\").reduce(np.ptp).plot())"
529+
"(data.coarsen(lat=5, lon=5, boundary=\"trim\").reduce(np.mean).plot())"
530530
]
531531
},
532532
{

overview/get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Be patient, it can take a few minutes for a server to become available on the Cl
1515

1616
**1. On your computer:** Running tutorials on your computer requires some setup:
1717

18-
We recommend using [`conda-lock`](https://conda-incubator.github.io/conda-lock/) to ensure a fully reproducible Python environment
18+
We recommend using [`conda-lock`](https://conda.github.io/conda-lock/) to ensure a fully reproducible Python environment
1919

2020
```
2121
git clone https://github.com/xarray-contrib/xarray-tutorial.git

overview/xarray-in-45-min.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
"\n",
241241
"<img src=\"https://raw.githubusercontent.com/numpy/numpy/623bc1fae1d47df24e7f1e29321d0c0ba2771ce0/branding/logo/primary/numpylogo.svg\" width=\"25%\">\n",
242242
"\n",
243-
"Xarray structures wrapunderlying simpler array-like data structures. This part of Xarray is quite extensible allowing for distributed array, GPU arrays, sparse arrays, arrays with units etc. We'll briefly look at this later in this tutorial."
243+
"Xarray structures wrap underlying simpler array-like data structures. This part of Xarray is quite extensible allowing for distributed array, GPU arrays, sparse arrays, arrays with units etc. We'll briefly look at this later in this tutorial."
244244
]
245245
},
246246
{
@@ -971,7 +971,7 @@
971971
"<img src=\"https://docs.dask.org/en/stable/_images/dask_horizontal.svg\" width=\"20%\"> [distributed parallel arrays](https://docs.dask.org/en/latest/array.html) & [Xarray user guide on Dask](https://docs.xarray.dev/en/stable/user-guide/dask.html)\n",
972972
"\n",
973973
"\n",
974-
"<img src=\"https://sparse.pydata.org/en/stable/_images/logo.png\" width=\"15%\"> **pydata/sparse** : [sparse arrays](https://sparse.pydata.org)\n",
974+
"<img src=\"https://raw.githubusercontent.com/pydata/sparse/master/docs/logo.svg\" width=\"15%\"> **pydata/sparse** : [sparse arrays](https://sparse.pydata.org)\n",
975975
"\n",
976976
"<img src=\"https://raw.githubusercontent.com/cupy/cupy.dev/master/images/cupy_logo.png\" width=\"22%\"> [GPU arrays](https://cupy.dev) & [cupy-xarray](https://cupy-xarray.readthedocs.io/)\n",
977977
"\n",

0 commit comments

Comments
 (0)