Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

re-lock #222

Merged
merged 26 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30,574 changes: 21,024 additions & 9,550 deletions .binder/conda-lock.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .binder/environment-python_and_r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies:
- erddapy
- flake8
- folium
- geodatasets
- geojson
- geojsonio
- geolinks
Expand Down
1 change: 1 addition & 0 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ dependencies:
- erddapy
- flake8
- folium
- geodatasets
- geojson
- geojsonio
- geolinks
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/test-env.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test Environment
name: Test Environment and link rot

on:
pull_request:
Expand All @@ -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
Expand All @@ -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
7 changes: 3 additions & 4 deletions .github/workflows/test-install-instructions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -6558,7 +6556,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.5"
"version": "3.12.5"
}
},
"nbformat": 4,
Expand Down
Loading
Loading