Merge branch 'ioos:main' into main

ioos · Sep 19, 2024 · 26e7577 · 26e7577
2 parents 3f6676a + 4791a6e
commit 26e7577
Show file tree

Hide file tree

Showing 16 changed files with 22,002 additions and 10,402 deletions.
diff --git a/.binder/conda-lock.yml b/.binder/conda-lock.yml
diff --git a/.binder/environment-python_and_r.yml b/.binder/environment-python_and_r.yml
@@ -18,6 +18,7 @@ dependencies:
   - erddapy
   - flake8
   - folium
+  - geodatasets
   - geojson
   - geojsonio
   - geolinks

diff --git a/.binder/environment.yml b/.binder/environment.yml
@@ -17,6 +17,7 @@ dependencies:
   - erddapy
   - flake8
   - folium
+  - geodatasets
   - geojson
   - geojsonio
   - geolinks

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -24,7 +24,6 @@ jobs:
         shell: bash -l {0}
         run: >
           set -e
-          && jupyter-book build jupyterbook --builder linkcheck
           && jupyter-book build jupyterbook
 
       - name: GitHub Pages action

diff --git a/.github/workflows/test-env.yml b/.github/workflows/test-env.yml
@@ -1,4 +1,4 @@
-name: Test Environment
+name: Test Environment and link rot
 
 on:
   pull_request:
@@ -8,8 +8,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
       fail-fast: false
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
@@ -23,6 +26,10 @@ jobs:
             --file .binder/conda-lock.yml
 
       - name: Test environment
-        shell: bash -l {0}
-        run: |
+        run: >
           python -c 'import osgeo.gdal; print(dir(osgeo.gdal))'
+
+      - name: Test links
+        if: startsWith(matrix.os, 'ubuntu')
+        run: >
+          jupyter-book build jupyterbook --builder linkcheck
diff --git a/.github/workflows/test-install-instructions.yml b/.github/workflows/test-install-instructions.yml
@@ -17,16 +17,17 @@ jobs:
           - os: windows-latest
             INSTALLER: "Miniforge3-Windows-x86_64.exe"
       fail-fast: false
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
       - name: Download Miniforge3 and the Env File
-        shell: bash -l {0}
         run: >
           curl -L -O https://github.com/conda-forge/miniforge/releases/latest/download/${{ matrix.INSTALLER }}
           && curl -L -O https://raw.githubusercontent.com/ioos/ioos_code_lab/main/.binder/environment.yml
 
       - name: Install Miniforge3 on *nix
-        shell: bash -l {0}
         if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macOS')
         run: |
           sh ${{ matrix.INSTALLER }} -b
@@ -38,7 +39,6 @@ jobs:
           start /wait "" ${{ matrix.INSTALLER }} /InstallationType=JustMe /AddToPath=0 /RegisterPython=0 /S /D=C:\miniforge3
 
       - name: Create on *nix
-        shell: bash -l {0}
         if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macOS')
         run: |
           ~/miniforge3/bin/conda env create --quiet --file environment.yml
@@ -51,7 +51,6 @@ jobs:
           C:\miniforge3\Scripts\conda.exe env create --quiet --file environment.yml
 
       - name: Test environment on *nix
-        shell: bash -l {0}
         if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macOS')
         run: >
           source ~/miniforge3/bin/activate IOOS

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -34,7 +34,7 @@ repos:
       - id: add-trailing-comma
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.6.5
     hooks:
       - id: ruff
 

diff --git a/jupyterbook/content/code_gallery/data_access_notebooks/2016-10-12-fetching_data.ipynb b/jupyterbook/content/code_gallery/data_access_notebooks/2016-10-12-fetching_data.ipynb
diff --git a/jupyterbook/content/code_gallery/data_access_notebooks/2017-09-09-hurricane_irma.ipynb b/jupyterbook/content/code_gallery/data_access_notebooks/2017-09-09-hurricane_irma.ipynb
@@ -48,12 +48,10 @@
     "\n",
     "Created: 2017-09-09\n",
     "\n",
-    "Updated: 2022-05-27\n",
+    "Updated: 2024-09-18\n",
     "\n",
     "This notebook aims to demonstrate how to create a simple interactive GIS map with the National Hurricane Center predictions \\[1\\] and the observed sea surface height from CO-OPS \\[2\\].\n",
     "\n",
-    "See https://tidesandcurrents.noaa.gov/quicklook/view.html?name=IRMA for the latest information on Irma.\n",
-    "\n",
     "1. https://www.nhc.noaa.gov/gis/\n",
     "1. https://opendap.co-ops.nos.noaa.gov/ioos-dif-sos/\n",
     "\n",
@@ -6558,7 +6556,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ dependencies: @@
       - erddapy
       - flake8
       - folium
+      - geodatasets
       - geojson
       - geojsonio
       - geolinks
@@ Expand Down @@