Merge branch 'main' into engine-flow

Author: JessicaS11

.devcontainer/Dockerfile

@@ -1 +1 @@
-FROM pangeo/base-image:2024.06.24
+FROM pangeo/base-image:2024.06.28

.devcontainer/scipy2024/devcontainer.json

@@ -12,7 +12,7 @@
   },
   "customizations": {
     "codespaces": {
-      "openFiles": ["workshops/scipy2024/README.md"]
+      "openFiles": ["workshops/scipy2024/index.ipynb"]
     },
     "vscode": {
       "extensions": ["ms-toolsai.jupyter", "ms-python.python"]

README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/xarray-contrib/xarray-tutorial/workflows/CI/badge.svg?branch=main)](https://github.com/xarray-contrib/xarray-tutorial/actions?query=branch%3Amain)
 [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://tutorial.xarray.dev)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/xarray-contrib/xarray-tutorial/HEAD?labpath=overview/fundamental-path/index.ipynb)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/xarray-contrib/xarray-tutorial/HEAD?labpath=workshops/scipy2024/index.ipynb)
 
 This is the repository for a Jupyter Book website with tutorial material for [Xarray](https://github.com/pydata/xarray), _an open source project and Python package that makes working with labelled multi-dimensional arrays simple, efficient, and fun!_
 

_config.yml

@@ -8,7 +8,8 @@ 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: '<a href="https://forms.gle/KEq7WviCdz9xTaJX6">The Xarray 2024 User Survey is live. Please take ~5 minutes to fill it out and help us improve Xarray.</a>'
+  #announcement: 'ℹ️ SciPy 2024 Tutorial Attendees. <a href="https://tutorial.xarray.dev/workshops/scipy2024/README.html">Click here </a>.'
   home_page_in_navbar: false
   use_edit_page_button: true
   use_issues_button: true
@@ -68,10 +69,14 @@ sphinx:
     # maintain old paths and redirect them (so google results dont go to 404)
     # https://github.com/wpilibsuite/sphinxext-rediraffe
     - sphinxext.rediraffe
+    - sphinx_codeautolink
+    - sphinxcontrib.mermaid
+
   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"]
+    codeautolink_concat_default: True
     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: /
@@ -81,3 +86,26 @@ sphinx:
       fundamentals/02.1_working_with_labeled_data.ipynb: fundamentals/02.1_indexing_Basic.ipynb
 
     bibtex_reference_style: author_year # or label, super, \supercite
+
+    intersphinx_mapping:
+      xarray:
+        - https://docs.xarray.dev/en/latest/
+        - null
+      numpy:
+        - https://numpy.org/doc/stable
+        - null
+      scipy:
+        - https://docs.scipy.org/doc/scipy
+        - null
+      matplotlib:
+        - https://matplotlib.org/stable/
+        - null
+      dask:
+        - https://docs.dask.org/en/latest
+        - null
+      python:
+        - https://docs.python.org/3/
+        - null
+      pandas:
+        - https://pandas.pydata.org/pandas-docs/stable
+        - null

_static/announcement.css

@@ -0,0 +1,3 @@
+.bd-header-announcement {
+  background-color: var(--pst-color-info-bg);
+}

_static/style.css

@@ -45,7 +45,10 @@ parts:
       - file: intermediate/xarray_and_dask
       - file: intermediate/xarray_ecosystem
       - file: intermediate/hvplot
-      - file: intermediate/cmip6-cloud
+      - file: intermediate/remote_data/index
+        sections:
+          - file: intermediate/remote_data/cmip6-cloud.ipynb
+          - file: intermediate/remote_data/remote-data.ipynb
       - file: intermediate/data_cleaning/05.1_intro.md
         sections:
           - file: intermediate/data_cleaning/05.2_examples.md
@@ -78,15 +81,16 @@ parts:
 
   - caption: Workshops
     chapters:
+      - file: workshops/scipy2024/index.ipynb
       - file: workshops/scipy2023/README
-      - file: workshops/oceanhackweek2020/README
-        sections:
-          - url: https://tutorial.xarray.dev/overview/xarray-in-45-min
-            title: Xarray in 45 minutes
       - file: workshops/thinking-like-xarray/README
         sections:
           - url: https://tutorial.xarray.dev/intermediate/01-high-level-computation-patterns
             title: High-level computation patterns
+      - file: workshops/oceanhackweek2020/README
+        sections:
+          - url: https://tutorial.xarray.dev/overview/xarray-in-45-min
+            title: Xarray in 45 minutes
       - file: workshops/online-tutorial-series/README
         sections:
           - file: workshops/online-tutorial-series/01_xarray_fundamentals

_toc.yml

@@ -336,7 +336,7 @@
     "\n",
     "Try applying the minmax function to a 3d air temperature dataset \n",
     "```python\n",
-    "air3d = xr.tutorial.load_dataset(\"air_temperature\").air)\n",
+    "air3d = xr.tutorial.load_dataset(\"air_temperature\").air\n",
     "``` \n",
     "Your goal is to have a minimum and maximum value of temperature across all latitudes for a given time and longitude.\n",
     "\n",

advanced/apply_ufunc/complex-output-numpy.ipynb

@@ -42,7 +42,6 @@
     "\n",
     "```python\n",
     "setuptools.setup(\n",
-    "    ...\n",
     "    entry_points={\n",
     "        'xarray.backends': ['engine_name=package.module:my_backendentrypoint'],\n",
     "    },\n",
@@ -51,7 +50,7 @@
     "or pass it in `xr.open_dataset`:\n",
     "\n",
     "```python\n",
-    "xr.open_dataset(..., engine=MyBackendEntrypoint)\n",
+    "xr.open_dataset(filename, engine=MyBackendEntrypoint)\n",
     "```"
    ]
   },