Skip to content

Commit 07c17e0

Browse files
committed
Merge branch 'main' into ohw22
* main: Correct minor tutorial typos (xarray-contrib#149) Update backends.md (xarray-contrib#148) [pre-commit.ci] pre-commit autoupdate (xarray-contrib#147) [pre-commit.ci] pre-commit autoupdate (xarray-contrib#143) remove user survery banner (xarray-contrib#145) fix typo (xarray-contrib#146) Remote data access tutorial for CMIP6 Zarr data (xarray-contrib#132) Update 45 minute overview for OceanHackWeek 2022 (xarray-contrib#140)
2 parents 1f31d89 + 461423c commit 07c17e0

File tree

11 files changed

+357
-30
lines changed

11 files changed

+357
-30
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,7 @@ venv.bak/
114114

115115
# mypy
116116
.mypy_cache/
117+
118+
# misc
119+
.DS_Store
120+
.vscode/

.pre-commit-config.yaml

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

1515
- repo: https://github.com/psf/black
16-
rev: 22.6.0
16+
rev: 22.8.0
1717
hooks:
1818
- id: black
1919
- id: black-jupyter
2020

2121
- repo: https://github.com/keewis/blackdoc
22-
rev: v0.3.5
22+
rev: v0.3.7
2323
hooks:
2424
- id: blackdoc
2525

2626
- repo: https://github.com/PyCQA/flake8
27-
rev: 5.0.2
27+
rev: 5.0.4
2828
hooks:
2929
- id: flake8
3030

@@ -38,12 +38,12 @@ repos:
3838
- id: isort
3939

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

4545
- repo: https://github.com/kynan/nbstripout
46-
rev: 0.6.0
46+
rev: 0.6.1
4747
hooks:
4848
- id: nbstripout
4949
args: [--extra-keys=metadata.kernelspec metadata.language_info.version]

_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ only_build_toc_files: true
88
# See https://jupyterbook.org/customize/config.html#add-a-link-to-your-repository
99
html:
1010
# NOTE: this announcement shows up on all pages
11-
announcement: 'ℹ️ The 2022 Xarray User Survey is out! Please take ~5 minutes to help improve Xarray! <a href="https://docs.google.com/forms/d/e/1FAIpQLSfnMd8UsC1XP1lPuFczl148VfpmwnFu4a0Z94odt1L6U0R0Pw/viewform">LINK</a>'
1211
home_page_in_navbar: false
1312
use_edit_page_button: true
1413
use_issues_button: true

_toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ parts:
3737
- file: intermediate/xarray_and_dask
3838
- file: intermediate/xarray_ecosystem
3939
- file: intermediate/hvplot
40+
- file: intermediate/cmip6-cloud
4041
- file: data_cleaning/ice_velocity.ipynb
4142

4243
- caption: Advanced

advanced/backends/backends.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import xarray as xr
99
xr.open_dataset("my_file.grib" , engine="cfgrib")
1010
```
1111

12-
For each available egine there is an underlying backend, that reads the data and pack them in a dataset.
12+
For each available engine there is an underlying backend, that reads the data and pack them in a dataset.
1313

1414
Xarray bundles several backends internally for the following formats:
1515

fundamentals/01_datastructures.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"source": [
237237
"#### String representations\n",
238238
"\n",
239-
"We can use the same two respresentations (`\"html\"`, which is only available in\n",
239+
"We can use the same two representations (`\"html\"`, which is only available in\n",
240240
"notebooks, and `\"text\"`) to display our `DataArray`."
241241
]
242242
},

0 commit comments

Comments
 (0)