Merge branch 'source' into emiliom-patch-2

Author: eeholmes

.github/workflows/check_sphinx_build.yml

@@ -1,38 +1,41 @@
 name: Check Sphinx Build
+
 on:
   pull_request:
     branches: [master, source]
 
 jobs:
-  jekyll_build:
-    name: Jekyll build of web pages
+  build-docs:
+    name: Sphinx  build of web pages
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
-      # https://github.com/actions/checkout
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
           submodules: true
 
       - name: Install Conda environment from environment.yml
-        uses: mamba-org/setup-micromamba@v2.0.0
+        uses: mamba-org/setup-micromamba@0dea6379afdaffa5d528b3d1dabc45da37f443fc  # v2.0.4
         with:
           environment-file: environment.yml
           cache-environment: true
 
       - name: Build documentation
         shell: bash -l {0}
         run: |
-          make html
+          make html linkcheck
 
       # workaround https://github.com/actions/upload-artifact/issues/38
       - name: tarball
         run: tar czf site.tar.gz ./_build/html/
 
       # https://github.com/actions/upload-artifact
       - name: Upload Website artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # 4.6.2
         with:
           name: Website
           path: site.tar.gz

.github/workflows/dependabot.yml

@@ -0,0 +1,15 @@
+# See https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "Bot"
+    groups:
+      github-actions:
+        patterns:
+          - '*'

_ext/team.yaml

@@ -70,6 +70,7 @@ team:
       - OHW22 Organizer - Global
       - OHW23 Organizer
       - OHW24 Organizer - USA
+      - OHW25 Organizer
 
   - name: Charley Haley
     title: Organizational & Social Strategist
@@ -93,6 +94,8 @@ team:
       - OHW22 Organizer - Maine
       - OHW23 Organizer
       - OHW24 Organizer - USA
+      - OHW25 Organizer
+      - OHW25 Infrastructure
 
   - name: Jane Koh
     title: Program Specialist
@@ -123,6 +126,8 @@ team:
       - OHW22 Organizer - Seattle
       - OHW23 Organizer
       - OHW24 Organizer - USA
+      - OHW25 Organizer
+      - OHW25 Project Mentor
 
   - name: Paige Martin
     title: User Training Team Leader
@@ -174,6 +179,7 @@ team:
       - OHW22 Organizer - Maine
       - OHW23 Organizer
       - OHW24 Organizer - USA
+      - OHW25 Organizer
 
   - name: Thomas Moore
     title: Ocean Data Analyst
@@ -209,6 +215,7 @@ team:
       - OHW22 Organizer - Seattle
       - OHW23 Organizer
       - OHW24 Organizer - USA
+      - OHW25 Organizer
 
   - name: Nick Mortimer
     title: Senior Engineer
@@ -236,17 +243,6 @@ team:
       - OHW22 Organizer - Global
       - OHW23 Organizer
 
-  - name: Georgy Manucharyan
-    title: Assistant Professor
-    affiliate: UW School of Oceanography
-    image_url: https://www.ocean.washington.edu/files/dsc_0104-20191128052712_smsq.jpg
-    github_user: gmanuch
-    email: gmanuch@uw.edu
-    roles:
-      - Projects
-      - Tutorials
-      - OHW22 Organizer - Seattle UG
-
   - name: Steve Diggs
     title: Data Manager
     affiliate: Scripps Institution of Oceanography
@@ -329,8 +325,10 @@ team:
     # email:
     roles:
       - Steering Committee
-      - OHW23 Organizer
-      - OHW24 Organizer - USA
+      - OHW23 Organizer, Tutorial
+      - OHW24 Organizer, Tutorial - USA
+      - OHW25 Organizer
+      - OHW25 Tutorial Lead
 
   - name: Ben Tupper
     title: Senior Research Associate
@@ -339,6 +337,7 @@ team:
     github_user: btupper
     roles:
       - OHW23 Organizer
+      - OHW24 Project Mentor
 
   - name: Callum Rollo
     title: Data Scientist
@@ -347,7 +346,8 @@ team:
     github_user: callumrollo
     roles:
       - OHW20 Participant
- 
+      - OHW24 Tutorial Lead
+      
   - name: Natalia Ribeiro
     title: Science Officer
     affiliate: Integrated Marine Observing System (IMOS), Australia
@@ -373,14 +373,16 @@ team:
 
   - name: Eli Holmes 
     title: Senior Scientist
-    affiliate: NOAA Fisheries 
+    affiliate: NOAA Fisheries, UW SAFS
     image_url: https://avatars.githubusercontent.com/u/2545978?v=4
     github_user: eeholmes
     email: eli.holmes@noaa.gov
     roles:
       - Steering Committee
-      - OHW23 Organizer - Seattle
-      - OHW24 Organizer - USA
+      - OHW23 Organizer, Project Mentor - Seattle
+      - OHW24 Organizer, Project Mentor - USA
+      - OHW25 Organizer
+      - OHW25 Project Mentor
 
   - name: Valentina Staneva 
     title: Senior Research Scientist
@@ -395,4 +397,44 @@ team:
       - OHW20 Instructor
       - OHW22 Instructor, Project Mentor
       - OHW23 Project Mentor, Funding
-      - OHW24 Organizer 
+      - OHW24 Organizer, Project Mentor
+      - OHW25 Organizer
+      - OHW25 Project Mentor
+
+  - name: Georgy Manucharyan
+    title: Assistant Professor
+    affiliate: UW School of Oceanography
+    image_url: https://www.ocean.washington.edu/files/dsc_0104-20191128052712_smsq.jpg
+    github_user: gmanuch
+    email: gmanuch@uw.edu
+    roles:
+      - OHW22 Organizer - Seattle UG
+
+  - name: Christian Sarason
+    title: Senior Research Scientist
+    affiliate: UW Applied Physics Laboratory
+    image_url: https://avatars.githubusercontent.com/u/665290?v=4
+    github_user: cpsarason
+    email: cbps@uw.edu
+    roles:
+      - OHW25 Organizer
+
+  - name: Jon Peake 
+    title: Data Scientist
+    affiliate: NOAA Fisheries
+    image_url: https://avatars.githubusercontent.com/u/27690999?v=4
+    github_user: jonpeake
+    email: jonathan.peake@noaa.gov
+    roles:
+      - OHW25 Project Mentor
+
+  - name: Rich Signell 
+    title: Research Oceanographer
+    affiliate: Open Science Computing
+    image_url: https://avatars.githubusercontent.com/u/125569335?v=4
+    github_user: rsignell
+    email: rich@opensciencecomputing.com 
+    roles:
+      - Steering Committee
+      - OHW25 Organizer
+      - OHW25 Project Mentor

about/fellows.md

@@ -0,0 +1,36 @@
+---
+layout: page
+title: OceanHackWeek Fellows Program
+permalink: fellows.html
+---
+
+
+# OceanHackWeek Fellows Program
+
+Are you interested in helping at the OceanHackWeek workshop? Would you like to host your own OceanHackWeek style event? Then the OceanHackWeek Fellows Program is for you!
+
+Through this program, fellows will learn about all aspects of organizing an OceanHackWeek (OHW) workshop, from logistics to curriculum planning. 
+Fellows will be immersed in the OHW philosophy and help support our mission to meet, collaborate, and learn at the intersection of ocean and data sciences. 
+After this program, fellows will be equipped to host their own OHW style events.
+
+## OHW Fellows Program Requirements
+
+1. Join, attend and actively engage in the Organizing Committee for the annual OHW Workshop. 
+The committee typically meets once a week, but many tasks are carried out by subgroups of the main committee asynchronously from the main Organizing Committee meetings.
+
+2. Attend the annual OHW workshop and join as a project mentor, assist with logistics support, deliver a tutorial and/or assist with any other organizational matters that arise during the workshop.
+
+3. Meet with the OHW Steering Committee after the annual OHW workshop to discuss lessons learned and future directions.
+
+## OHW Fellows Program 2025: Important Information
+
+* OceanHackWeek 2025 (OHW25) will consist of an in-person event at the **University of Washington, Seattle, USA, on August 18th-22nd, 2025**. OHW Fellows will be required to attend this event.
+* Thanks to the support of our sponsor, there will be no cost for lodging or meals to attend OHW25. We will be able to support some travel expenses, as well as provide a stipend to any participating fellows.
+
+<!--
+[**Apply for the OHW Fellows program now!**](https://forms.gle/pPiyq5yrmEABzhXB8) We will start reviewing applications immediately, with applications closing on July 14th, 2025. 
+-->
+Applications are closed. Accepted applicants will be notified no later than July 21st, 2025. 
+
+For general questions, please email info@oceanhackweek.org
+

about/pasthackweeks.md

@@ -7,9 +7,17 @@ description: Access materials from past hackweeks
 
 # Past OHW Events
 
-OceanHackWeek (**OHW**) has taken place annually starting in 2018. Materials from past hackweeks are available, though they may be incomplete, particularly for older events. Links to past tutorials and projects are also provided in most cases.
+OceanHackWeek (**OHW**) has taken place annually starting in 2018. Materials from past hackweeks are available, though they may be incomplete, particularly for older events. Links to past tutorials and projects are also provided in most cases. [Searchable table of past OHW projects](https://oceanhackweek.org/ohw24_proj_catalog_us/OHW_project_table.html).
 
-OceanHackWeek started out as an in-person event in Seattle with limited virtual access in 2018 and 2019, but moved to a virtual format in 2020 and a hybrid format starting in 2021.
+OceanHackWeek started out as an in-person event in Seattle with limited virtual access in 2018 and 2019, but moved to a virtual format in 2020 and a hybrid format from 2021 to 2023. In 2024, it was held at two in-person locations.
+
+## 2024 (OHW24)
+
+- Two in-person events, at the Bigelow Laboratory for Ocean Sciences, East Boothbay, Maine, USA and in Sydney, Australia.
+- Programming languages: Python + R
+- [11 tutorials](../ohw24/tutorials-index/index) + [11 projects](../ohw24/projects/projects_thisyear)
+- [Schedule](../ohw24/schedule)
+- [Web site](../ohw24/index)
 
 ## 2023 (OHW23)
 
@@ -36,8 +44,7 @@ OceanHackWeek started out as an in-person event in Seattle with limited virtual
 - 7 tutorials + [11 projects](https://oceanhackweek.org/ohw-resources/projects/projectlist/)
 - [Schedule](https://oceanhackweek.org/ohw-resources/schedule/#main-virtual-event). Links to tutorials are found here
 - [Participant testimonials](testimonials.md#ohw21-hybrid)
-- [Web site](https://oceanhackweek.org/ohw21/)
-- [OHW21 Resources site](https://oceanhackweek.org/ohw-resources/)
+- [Main web site](https://oceanhackweek.org/ohw21/) and [OHW21 Resources site](https://oceanhackweek.org/ohw-resources/)
 
 ## 2020 (OHW20)
 
@@ -46,8 +53,7 @@ OceanHackWeek started out as an in-person event in Seattle with limited virtual
 - 10 tutorials + [8 projects](https://oceanhackweek.org/ohw21/projects_2020.html)
 - [Participant testimonials](testimonials.md#ohw20-virtual)
 - [Schedule](https://oceanhackweek.org/ohw-resources/ohw20/schedule/). Links to tutorials are found here
-- [Web site](https://oceanhackweek.org/ohw20/)
-- [OHW20 Resources site](https://oceanhackweek.org/ohw-resources/ohw20/)
+- [Main web site](https://oceanhackweek.org/ohw20/) and [OHW20 Resources site](https://oceanhackweek.org/ohw-resources/ohw20/)
 
 ## 2019 (OHW19)
 
@@ -72,6 +78,7 @@ OceanHackWeek started out as an in-person event in Seattle with limited virtual
 :maxdepth: 1
 :hidden:
 
+../ohw24/index.md
 ../ohw23/index.md
 ../ohw22/index.md
 ```

assets/images/logos/nmfs-opensci.png

@@ -50,7 +50,7 @@
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
 html_show_copyright = True
-copyright = "2023, OceanHackWeek"
+copyright = "2025, OceanHackWeek"
 
 
 # -- HTML Config -------------------------------------------------
@@ -101,7 +101,7 @@
 }
 
 html_title = "OceanHackWeek"
-# html_favicon = "_static/magnifying.ico"
+html_favicon = "_static/logo.png"
 html_static_path = ["_static"]
 html_sidebars = {
     "index": [

assets/images/logos/openscapes.png

@@ -6,16 +6,41 @@ description: OceanHackWeek home
 
 # OceanHackWeek (OHW)
 
-:::{admonition} OceanHackWeek 2024 will be on August 26 - 30!
+:::{admonition} Applications Closed for OceanHackWeek 2025. Decisions by July 21.
 :class: important
 
+We are planning an in-person event at the University of Washington **Aug 18-22, 2025** in Seattle, WA USA. 
+What is OceanHackWeek? [Check out our past events](about/pasthackweeks), including [OHW24](ohw24/index). Please [contact us](about/contact) if you're interested in contributing to OceanHackWeek 2025 as [tutorial instructor or project mentor](resources/organizing/index).
 
-```{button-link} ohw24/
+<!--
+```{button-link} https://forms.gle/npWmq1QA4twbV5LT7
+:color: primary
+:expand:
+:tooltip: Apply to OHW25
+Apply to OceanHackWeek 2025
+```
+-->
+:::
+
+
+:::{admonition} New in 2025: The OceanHackWeek Fellows Program
+:class: admonition
+
+Are you interested in helping at the OceanHackWeek workshop? Would you like to host your own OceanHackWeek style event? Then the OceanHackWeek Fellows Program is for you!
+Fellows will be immersed in the [OHW philosophy](about/index) and help support our mission to meet, collaborate, and learn at the intersection of ocean and data sciences. 
+Fellows will join the Organizing Committee for [OHW25](ohw25/index). Funding support will be provided for Fellows to attend OHW25 as project mentors and assist
+with logistical support. 
+**Applications closed. Decisions announced by July 21.**
+For more details [check our OHW Fellows page](about/fellows). 
+
+<!--
+```{button-link} https://forms.gle/pPiyq5yrmEABzhXB8
 :color: primary
 :expand:
-:tooltip: OHW24
-Go to OceanHackWeek 2024
+:tooltip: Apply to OHW25 Fellows
+Apply to OceanHackWeek 2025 Fellows Program
 ```
+-->
 :::
 
 
@@ -168,7 +193,8 @@ Thanks to our sponsors that have made OceanHackWeek possible over the last sever
 :hidden:
 
 about/index.md
-OceanHackWeek 2024 <ohw24/index.md>
+OceanHackWeek 2025 <ohw25/index.md>
+OceanHackWeek Fellows <about/fellows.md>
 resources/index.md
 about/pasthackweeks.md
 ```