Merge branch 'xarray-contrib:main' into main

Author: negin513

.devcontainer/Dockerfile

@@ -1 +1 @@
-FROM pangeo/base-image:2023.07.05
+FROM pangeo/base-image:2024.05.07

.github/dependabot.yml

@@ -1,6 +1,10 @@
 version: 2
 updates:
-  - package-ecosystem: 'docker'
-    directory: '/.devcontainer'
+  - package-ecosystem: "docker"
+    directory: "/.devcontainer"
     schedule:
-      interval: 'daily'
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/.github"
+    schedule:
+      interval: "monthly"

.github/workflows/main.yaml

@@ -14,7 +14,7 @@ permissions:
 
 # Allow one concurrent deployment
 concurrency:
-  group: 'pages'
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/preview.yaml

@@ -6,7 +6,7 @@ permissions:
   pull-requests: write # allow surge-preview to create/update PR comments
 
 concurrency:
-  group: 'preview'
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/qaqc.yaml

@@ -6,7 +6,7 @@ on:
       - main
 
 concurrency:
-  group: 'qaqc'
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -33,7 +33,7 @@ jobs:
         with:
           check_filenames: true
           check_hidden: true
-          skip: '.git,*.js,qaqc.yml'
+          skip: ".git,*.js,qaqc.yml"
           ignore_words_list: hist,nd
 
       # borrowed from https://github.com/ProjectPythia/pythia-foundations/blob/main/.github/workflows/link-checker.yaml

.pre-commit-config.yaml

@@ -3,43 +3,44 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-docstring-first
       - id: check-json
+        exclude: ^.devcontainer/
       - id: check-yaml
       - id: double-quote-string-fixer
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.4.2
     hooks:
       - id: black
       - id: black-jupyter
 
   - repo: https://github.com/keewis/blackdoc
-    rev: v0.3.8
+    rev: v0.3.9
     hooks:
       - id: blackdoc
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 7.0.0
     hooks:
       - id: flake8
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.9-for-vscode
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
 
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.6.1
+    rev: 0.7.1
     hooks:
       - id: nbstripout
         args: [--extra-keys=metadata.kernelspec metadata.language_info.version]

.prettierignore

@@ -1,2 +1 @@
-*lock.yml
-conda/
+conda/**

README.md

@@ -58,4 +58,4 @@ Thanks to our contributors so far!
 
 ## Acknowledgements
 
-This website is the result of many contributions from the Xarray community! We're very grateful for everyone's volunteered effort as well as [sponsored development](https://xarray.dev/#sponsors). Funding for SciPy 2022, SciPy 2023 tutorial materialdevelopment specifically was supported by NASA's Open Source Tools, Frameworks, and Libraries Program (award 80NSSC22K0345).
+This website is the result of many contributions from the Xarray community! We're very grateful for everyone's volunteered effort as well as [sponsored development](https://xarray.dev/#sponsors). Funding for SciPy 2022, SciPy 2023 tutorial material development specifically was supported by NASA's Open Source Tools, Frameworks, and Libraries Program (award 80NSSC22K0345).

_config.yml

@@ -1,14 +1,14 @@
 # Learn more at https://jupyterbook.org/customize/config.html
-title: ''
+title: ""
 author: The Xarray Community
-copyright: '2023'
+copyright: "2023"
 logo: images/logo.png
 only_build_toc_files: true
 
 # See https://jupyterbook.org/customize/config.html#add-a-link-to-your-repository
 html:
   # NOTE: this announcement shows up on all pages
-  announcement: 'ℹ️ SciPy Tutorial Attendees. <a href="https://tutorial.xarray.dev/workshops/scipy2023/README.html">Click here </a>.'
+  #announcement: 'ℹ️ SciPy Tutorial Attendees. <a href="https://tutorial.xarray.dev/workshops/scipy2023/README.html">Click here </a>.'
   home_page_in_navbar: false
   use_edit_page_button: true
   use_issues_button: true
@@ -35,7 +35,7 @@ parse:
 # Force re-execution of notebooks on each build.
 # See https://jupyterbook.org/content/execute.html
 execute:
-  execute_notebooks: 'cache'
+  execute_notebooks: "cache"
   allow_errors: false
   # Per-cell notebook execution limit (seconds)
   timeout: 300
@@ -48,11 +48,11 @@ latex:
 # Configure your Binder links, such as the URL of the BinderHub.
 launch_buttons:
   notebook_interface: jupyterlab
-  binderhub_url: 'https://mybinder.org'
+  binderhub_url: "https://mybinder.org"
 
 # Information about where the book exists on the web
 repository:
-  url: 'https://github.com/xarray-contrib/xarray-tutorial'
+  url: "https://github.com/xarray-contrib/xarray-tutorial"
   branch: main
 
 # Bibliography
@@ -71,7 +71,7 @@ sphinx:
   config:
     language: en # accessibility
     # application/vnd.holoviews_load.v0+json, application/vnd.holoviews_exec.v0+json
-    suppress_warnings: ['mystnb.unknown_mime_type', 'misc.highlighting_failure']
+    suppress_warnings: ["mystnb.unknown_mime_type", "misc.highlighting_failure"]
     notfound_context:
       body: "<h1>Whoops! 404 Page Not Found</h1>\n\n<p>Sorry, this page doesn't exist. Many sections of this book have been updated recently.</p><p> Try the search box 🔎 to find what you're looking for!</p>"
     notfound_urls_prefix: /

_toc.yml

@@ -9,6 +9,7 @@ parts:
       - file: overview/learning-paths.md
         sections:
           - file: overview/fundamental-path/README.md
+          - file: overview/intermediate-path/README.md
 
   - caption: Fundamentals
     chapters:
@@ -45,9 +46,12 @@ parts:
       - file: intermediate/xarray_ecosystem
       - file: intermediate/hvplot
       - file: intermediate/cmip6-cloud
-      - file: data_cleaning/data_cleaning.md
+      - file: intermediate/data_cleaning/05.1_intro.md
         sections:
-          - file: data_cleaning/ice_velocity
+          - file: intermediate/data_cleaning/05.2_examples.md
+          - file: intermediate/data_cleaning/05.3_ice_velocity
+          - file: intermediate/data_cleaning/05.4_contributing.md
+          - file: intermediate/data_cleaning/05.5_scipy_talk.md
 
   - caption: Advanced
     chapters: