Skip to content

Commit a652e73

Browse files
committed
Merge branch 'source' into ohw22-espanol
2 parents 730ac51 + 7e3a0ef commit a652e73

10 files changed

Lines changed: 67 additions & 88 deletions

File tree

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
# -- Myst config ---------------------------------------------------
129129
myst_admonition_enable = True
130130
myst_deflist_enable = True
131+
myst_heading_anchors = 3
131132
myst_update_mathjax = False
132133
myst_enable_extensions = ["substitution", "colon_fence"]
133134

ohw22/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The [**Global Virtual Event**](global/index) will take place through synchronous
3737
### Regional Satellites
3838
[**Six Regional Satellite Events**](satellites) will take place this year to serve as local connecting points for project work, community building, and engaging potential future OHW organizers. [OHW22 organizers](organizers) invite participants geographically located near one of these regional satellites or interested in virtual participation in a specific satellite to select one of these events. The satellite events may be virtual or in-person and take different formats depending on the event organizers. In-person participants may be required to be fully vaccinated against COVID-19.
3939

40-
In coordination with the OHW Northwest satellite event, there will be a **[3-week-long undergraduate summer program “Data Science in Oceanography”](satellites/#undergraduate-summer-program-data-science-in-oceanography) taking place in-person on August 8-26 at the University of Washington**. This program will provide opportunities for undergraduate students in data-driven research in oceanography. See [the satellite event page](./seattle/index.md) for detail.
40+
In coordination with the OHW Northwest satellite event, there will be a **[3-week-long undergraduate summer program “Data Science in Oceanography”](seattle/index.md#undergraduate-summer-program-august-8-26-2022) taking place in-person on August 8-26 at the University of Washington**. This program will provide opportunities for undergraduate students in data-driven research in oceanography. See [the satellite event page](./seattle/index.md) for detail.
4141

4242
## OHW22 Sponsors
4343

ohw22/schedule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ With a global virtual event and many satellites, this schedule is still very muc
1313

1414
## Overview of the global event
1515

16-
<iframe width=600 height=600 src="https://docs.google.com/spreadsheets/d/e/2PACX-1vQSK-BFmCaqDp04f6Kfc1tWNIHFDaxHclqe-2Rb4vNlt0we2bqXednUJ_Zk2sRoeqd5nxqsEvJHjYfm/pubhtml?gid=0&amp;single=true&amp;widget=true&amp;headers=false"></iframe>
16+
<iframe width=700 height=600 src="https://docs.google.com/spreadsheets/d/e/2PACX-1vQSK-BFmCaqDp04f6Kfc1tWNIHFDaxHclqe-2Rb4vNlt0we2bqXednUJ_Zk2sRoeqd5nxqsEvJHjYfm/pubhtml?gid=0&amp;single=true&amp;widget=true&amp;headers=false"></iframe>
1717

1818
## Satellite events
1919

ohw22/seattle/index.md

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,18 @@ We will have two sub-programs in the US Northwest satellite, including a regular
44

55
These two sub-programs are coordinated in their planning and overlap in time. Participants are encouraged to interact fully across the groups and with other satellites.
66

7+
## Schedule
78

8-
## Location
9+
Our regular schedule will be 9am - 5pm PDT each day.
10+
11+
<iframe width=700 height=900 src="https://docs.google.com/spreadsheets/d/e/2PACX-1vQSK-BFmCaqDp04f6Kfc1tWNIHFDaxHclqe-2Rb4vNlt0we2bqXednUJ_Zk2sRoeqd5nxqsEvJHjYfm/pubhtml?gid=2096421604&amp;single=true&amp;widget=true&amp;headers=false"></iframe>
912

10-
University of Washington, Seattle, WA
13+
For full details of tutorials and events, see the [global schedule](../schedule.md).
1114

15+
## Location
16+
All activities will be in [Ocean Sciences Building (OSB) https://uw.edu/maps/#!/ocn](https://uw.edu/maps/#!/ocn) on the University of Washington Seattle campus.
17+
- OSB 425 will be main location for tutorials and large group discussions
18+
- Other OSB locations can be leveraged for breakout discussions
1219

1320
## Format
1421

@@ -17,22 +24,57 @@ In-person. We have space reserved to watch OHW tutorials together and work on pr
1724

1825
## Regular OHW satellite (August 15-19, 2022)
1926

20-
We welcome participants from all career stages and encourage applications from graduate students, postdocs and early career researchers. Advanced undergrad students with background in oceanography and data science are also welcome. Below is a summary of activities:
27+
<!--
28+
We welcome participants from all career stages and encourage applications from graduate students, postdocs and early career researchers. Advanced undergrad students with background in oceanography and data science are also welcome.
29+
-->
2130

22-
1. We will watch all the tutorials together
23-
2. Participants can asynchronously work on projects with participants of other OHW events (either the global virtual event or other satellites). Or participants can work on projects synchronously with other participants in the two sub-programs in Seattle.
24-
3. We encourage students to communicate with the global virtual event and other satellite events to augment their OHW experience.
31+
We will have a diverse group of researchers at this satellite!
2532

33+
With the detailed schedule shown above, during this week we will:
2634

27-
**Logistics**
35+
1. Watch all global virtual event tutorials together
36+
2. Enjoy our satellite-specific tutorials and discussions as a group
37+
3. Work asynchronously on projects with participants of other OHW events (either the global virtual event or other satellites)
38+
4. Find opportunties to connect with participants from the global virtual event and other satellites to broaden our OHW experience.
2839

40+
41+
### Meals
42+
- Most days: meal card $30/day, can use at any UW locations
43+
- Wednesday: we’ll have a discussion over pizza session
44+
- Help yourself for snacks and making coffee
45+
- Lunch will be 1400-1500 each day
46+
47+
<!--
2948
We are able to provide lodging for a small number of participants who need to travel within the US Northwest region to the event. Funding request is _not_ part of the application process and more info on this will be available after participants are accepted into this satellite.
49+
-->
3050

31-
**Contact**
51+
52+
### Preparations 1: Git basics
53+
For project work during OHW we will rely heavily on basic git operations, so come prepared!
54+
55+
- Here is a good tutorial to get you started/refreshed on Git basics
56+
- [Git basics video](https://www.youtube.com/watch?v=Bc5BO9gPC9w)
57+
- [Slides used in video](https://docs.google.com/presentation/d/17h4m6gTG8mRfWaQR3nOn6LPR3hQdCgWzH2hPzpCtyFU/edit#slide=id.p1)
58+
59+
60+
### Preparations 2: Lightning talks
61+
To help everyone get to know each other better, we will do a 2-min lightning talk on Monday morning to kick off our satellite.
62+
- Max **2 minutes**, so that we have time for everyone. We'll set a timer! :)
63+
- Suggested format (3 slides):
64+
- #1: Who am I?
65+
- #2: One project that may be of interest to others at OHW22
66+
- #3: What I want to get out of OHW22
67+
- Please [upload your slides here](https://drive.google.com/drive/folders/1x_Z0qw7xE6BEDtlvCyDHTb-WbCFMzd9X?usp=sharing) -- we've added the email we received from your registration to this folder. If you want another email to have access, slack message `@nw_organizers` in the `#ohw22_northwest` channel.
68+
69+
70+
### Contact
3271

3372
For questions specific to the regular OHW satellite, please ask in our [Github Discussions](https://github.com/orgs/oceanhackweek/discussions/categories/q-a?discussions_q=category%3AQ%26A+label%3A%22OHW22+-+Northwest%22). Please tag the organizers with `@oceanhackweek/ohw22-organizers-northwest` and add a `OHW22 - Northwest` label so that others can find answers. Additionally you can email Dr. Wu-Jung Lee (leewj@uw.edu).
3473

3574

75+
76+
77+
3678
## Undergraduate summer program (August 8-26, 2022)
3779

3880
This "Data Science in Oceanography" undergraduate program will be held in person at the University of Washington, Seattle campus and will provide opportunities for undergraduate students in data-driven research in oceanography. Participating students will interact closely with faculty and graduate student mentors to develop and advance individual research projects. Students will fully participate in the OHW Northwest satellite event as part of this longer undergraduate program.

resources/logistics/getting_help.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ You are also welcome to direct message the helpers if you don't feel comfortable
2525
- `@help-projects` - For help with managing projects, for instance asking how to set up a new repo, or organize meetings.
2626
- `@help-python` - Questions about Python programming.
2727
- `@help-r` - Questions about R programming.
28+
- `@help-ml` - Questions about machine learning.
29+
- `@help-git` - Questions about git.
2830
- `@help-tutorials` - For help with tutorial logistics, like cloning the notebooks.
2931
- `@help-website` - If there are any issues with the website tag us to take a look.
3032

@@ -42,5 +44,5 @@ See the [Projects Getting Started page](../projects/steps.md). Feel free to post
4244

4345
## Reporting a Code of Conduct violation
4446

45-
Harassment and other [Code of Conduct violations](../conduct.md) reduce the value of OceanHackWeek for everyone. If someone makes you or anyone else feel unsafe or unwelcome, please report it as soon as possible to one of the instructors. You can make a report either personally or anonymously. **Anonymous reports can be made [here](https://oceanhackweek.wufoo.com/forms/zep2ybt1swlulc/).**
47+
Harassment and other [Code of Conduct violations](../../about/code-of-conduct.md) reduce the value of OceanHackWeek for everyone. If someone makes you or anyone else feel unsafe or unwelcome, please report it as soon as possible to one of the instructors. You can make a report either personally or anonymously. **Anonymous reports can be made [here](https://oceanhackweek.wufoo.com/forms/zep2ybt1swlulc/).**
4648

resources/logistics/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OceanHackWeek 2022 will take place August 15-19.
88

99
**In-person participants** will gather as for times as directed by the satellite organizers. While **virtual participants** may choose to engage primarily with this group and schedule via Zoom and Slack, we strongly encourage you to join the program designed specifically as a virtual event. The virtual event will be split into two schedules and groups based on the distribution of participant time zones, in a 3-hour daily block of formal, live activities. The **larger virtual event** will take place 11:00am - 2:00pm PDT / 18:00 - 21:00 UTC.
1010

11-
Detailed schedules are available [Schedule page](../schedule.md).
11+
Detailed schedules are available [Schedule page](../../ohw22/schedule.md).
1212

1313
## Channel of communication: Slack
1414

@@ -27,7 +27,7 @@ We will use Zoom to broadcast all tutorials. The Zoom link will be distributed v
2727

2828
## Hack projects
2929

30-
See [Project overview](../projects/overview.md) and [Hacking at OHW21](../projects/steps.md) for more info.
30+
See [Project overview](../projects/index.md) and [Hacking at OHW22](../projects/steps.md) for more info.
3131

3232
## Getting Help
3333

resources/prep/git.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Submit a pull request by clicking `New pull request`:
214214
* Reviewer: look through changes in the files
215215
* Approve PR or ask for more changes.
216216

217-
```{admonition}
217+
```{admonition} Note
218218
While your pull request is pending, any change you push to the fork will become a part of the request. This is useful if you are asked to make small changes before your PR is accepted.
219219
```
220220

resources/prep/github.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The resources are actively being updated! Some parts are still out of date, and
99

1010
## About Git and GitHub
1111

12-
[Git](https://git-scm.com/) is a popular version control system that is the foundation of most open source software development. You are not required to be a Git pro in advance of this event, but come prepared to learn a lot about it! [GitHub](github.com) is a hosting service for Git repositories, enabling us to share code across teams in a web environment.
12+
[Git](https://git-scm.com/) is a popular version control system that is the foundation of most open source software development. You are not required to be a Git pro in advance of this event, but come prepared to learn a lot about it! [GitHub](https://github.com) is a hosting service for Git repositories, enabling us to share code across teams in a web environment.
1313

1414
We will use Git and GitHub for collaborative work. Be sure to arrive at {OceanHackWeek with your own [GitHub](https://github.com/) account.
1515

resources/prep/jupyterhub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ It will take a bit of time for this to load - be patient! Once things are spun u
4242

4343
## How do I get the tutorial repository?
4444

45-
For the tutorials, there are two primary ways of getting the notebooks. You can use the traditional git management route ([described below](#How-do-I-get-my-code-in-and-out-of-JupyterHub)), or you can use [this magical nbgitpuller link](https://oceanhackweek.2i2c.cloud/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Foceanhackweek%2Fohw-tutorials&urlpath=lab%2Ftree%2Fohw-tutorials%2F&branch=master).
45+
For the tutorials, there are two primary ways of getting the notebooks. You can use the traditional git management route ([described below](#how-do-i-get-my-code-in-and-out-of-jupyterhub)), or you can use [this magical nbgitpuller link](https://oceanhackweek.2i2c.cloud/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Foceanhackweek%2Fohw-tutorials&urlpath=lab%2Ftree%2Fohw-tutorials%2F&branch=OHW22).
4646

4747
Nbgitpuller is nice, because it will automatically merge any changes you make with the changes from the upstream repo on subsequent pulls via a [series of sane rules](https://jupyterhub.github.io/nbgitpuller/topic/automatic-merging.html#topic-automatic-merging).
4848

Lines changed: 6 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,15 @@
11
# Getting started on tutorials
22

3-
:::{admonition} Updates in progress
4-
:class: warning
5-
6-
The resources are actively being updated! Some parts are still out of date, and is the content from last year. In the meantime, please watch out for references to 2020, 2021 ("OHW21") or links that don't work.
7-
8-
:::
9-
103
## Introduction
114

12-
Most tutorials will be run live as Jupyter notebooks on the [OceanHackWeek JupyterHub ("The Hub")](https://ocean.hackweek.io/) in your browser. The instructor and and all participants can be running their own copies of the notebooks in their Hub account, with files cloned from the OHW source in GitHub.
13-
14-
Below are instructions for getting the tutorials started on the the Hub in your browser, and updating the tutorials files with the latest version from GitHub. The schedule of tutorials is available [here](../schedule.md), and links to tutorial materials and some background resources are availabe elsewhere in the Tutorials section.
15-
16-
17-
## Pre-Hackweek tutorials
18-
19-
- **Git and GitHub, including the Git fork - clone "workflow".** [Presentation slides (pdf)](https://github.com/oceanhackweek/ohw-preweek/tree/master/git-github-survival-guide") &mdash; [video](https://youtu.be/7nYFRixSV2c)
20-
- **Jupyter and Scientific Python basics: numpy, pandas, matplotlib.** [Jupyter notebooks](https://github.com/oceanhackweek/ohw-preweek/tree/master/data-analysis-modules) &mdash; [video](https://youtu.be/CTUAgpvfze0)
21-
22-
23-
## Start the Hub in your browser
24-
25-
### Step 1
26-
Navigate to the [OceanHackWeek Hub, https://ocean.hackweek.io/](https://ocean.hackweek.io/).
27-
28-
### Step 2
29-
Sign in using your GitHub account, if you are not already signed in. (First time only: Grant the OceanHackWeek Organization permissions - this grants you access to the cloud computing environment for the Hackweek.)
30-
31-
### Step 3
32-
Start the "Oceanhackweek" computing environement (the Oceanhackweek "image"). It may take up to a minute or so to start up.
33-
34-
35-
## Upload (`git clone`) a copy of the `oh20-tutorials` GitHub repository and follow along
36-
This basic workflow allows you to follow along with tutorials with your own live copy of the tutorials notebooks while staying up-to-date with any changes made to the master tutorials repository, [ohw20-tutorials](https://github.com/oceanhackweek/ohw20-tutorials).
37-
38-
### Shortcut
39-
The first time you try to upload (`git clone`) the `ohw20-tutorials` repository, launch a new terminal, then enter:
40-
41-
```bash
42-
git clone https://github.com/oceanhackweek/ohw20-tutorials.git
43-
```
44-
45-
Now you have a new `ohw20-tutorials` directory under your "home" directory, `/home/jovyan`. You're good to go!
46-
47-
### Longer description - Step 1
48-
Navigate to the [tutorial repository on GitHub](https://github.com/oceanhackweek/ohw20-tutorials).
49-
50-
Clone the tutorial to the Hub environment. You can easily copy the link to a repository by selecting the green "clone or download" dropdown (making sure the pop up says "Clone with HTTPS") and hitting the clipboard icon, which will automatically copy the link for you.
51-
52-
Launch a terminal using the "plus" sign in the upper left corner of your JupyterHub:
53-
54-
![Jupyter Launch Terminal](../img/Jupyter-LaunchNewTerminal.jpg)
55-
56-
then execute the `git clone` statement:
57-
58-
```bash
59-
git clone https://github.com/oceanhackweek/ohw20-tutorials.git
60-
```
61-
62-
A new `ohw20-tutorials` directory will be created, holding the repository clone.
63-
64-
<!-- _Note: a more detailed version of step 1, including images, is available as part of the [Preliminary Steps - JupyterHub Connection](https://icesat-2hackweek.github.io/learning-resources/preliminary/jupyterhub/#how-do-i-get-my-code-in-and-out-of-pangeo) -->
65-
66-
### Step 2
67-
Follow along by opening and running the tutorial notebooks. You can save changes within your clone (such as edits to a notebook) or add other files, then download a copy to your local machine if you'd like.
5+
Tutorials will be run live on the [OceanHackWeek JupyterHub ("The Hub"), https://oceanhackweek.2i2c.cloud](https://oceanhackweek.2i2c.cloud) in your browser either as Jupyter notebooks or as scripts and notebooks in RStudio. The instructor and all participants can be running their own copies of the tutorial in their Hub account, with files cloned from the OHW source in GitHub.
686

69-
### Step 3
70-
Update your Hub copy with any changes to the `origin` repository. If you have saved changes within your local copy of the notebook or added other files, this may cause conflicts (*ask us questions if you run into problems!*). Fetch and merge (using `git pull`) the latest changes from the `origin` remote.
7+
Below are instructions for getting the tutorials started on the the Hub in your browser, and updating the tutorials files with the latest version from the GitHub tutorials repository, [https://github.com/oceanhackweek/ohw-tutorials](https://github.com/oceanhackweek/ohw-tutorials).
718

72-
```bash
73-
git pull origin
74-
```
9+
The schedule of tutorials is available [here](../../ohw22/schedule.md), and links to tutorial materials and some background resources will be available there as well.
7510

76-
These instructions assume you're working on the default `master` branch.
11+
## How do I get the tutorial repository into the Hub?
7712

78-
**Please note: the OceanHackWeek JupyterHub (the Hub) should not be relied upon to save your files beyond the duration of the hackweek, and will be removed a couple of weeks after the hackweek. Thus, for any non-repository changes or repository changes that have not been pushed to GitHub, you MUST complete Step 3 to save the files to your local machine if you would like continued access to them.**
13+
For the tutorials, we recommend the use of [nbgitpuller](https://jupyterhub.github.io/nbgitpuller/) to clone and pull the tutorials repository, or update the clone you already have. Use [this magical nbgitpuller link](https://oceanhackweek.2i2c.cloud/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Foceanhackweek%2Fohw-tutorials&urlpath=lab%2Ftree%2Fohw-tutorials%2F&branch=OHW22) to accomplish this clone or update.
7914

80-
----
81-
Adapted from [https://icesat-2hackweek.github.io/learning-resources/tutorials/getting_started/](https://icesat-2hackweek.github.io/learning-resources/tutorials/getting_started/). Originally from [https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97](https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97)
15+
See this [extended discussion](../prep/jupyterhub.md#how-do-i-get-the-tutorial-repository) for more details about `nbgitpuller` and the alternative approach relying on `git` commands and `GitHub` workflows.

0 commit comments

Comments
 (0)