From dda11c1310252e75c3cda0f7b999aa7741b5dc24 Mon Sep 17 00:00:00 2001 From: Alex Kerney Date: Wed, 20 Jul 2022 13:05:35 -0400 Subject: [PATCH 1/2] Initial pass of resource updates Includes warnings on most pages that changes are in progress, and a very bare bones schedule page. --- index.md | 2 +- resources/index.md | 20 ++++-- resources/logistics/getting_help.md | 28 ++++++-- resources/logistics/overview.md | 6 +- resources/prep/conda.md | 40 +++++++---- resources/prep/conda_original.md | 96 -------------------------- resources/prep/git.md | 28 +++++--- resources/prep/github.md | 9 ++- resources/prep/jupyterhub.md | 9 ++- resources/projects/overview.md | 7 ++ resources/projects/steps.md | 13 +++- resources/schedule.md | 18 +++-- resources/tutorials/getting_started.md | 7 +- 13 files changed, 142 insertions(+), 141 deletions(-) delete mode 100644 resources/prep/conda_original.md diff --git a/index.md b/index.md index 599ff9c9..de9296e6 100644 --- a/index.md +++ b/index.md @@ -146,6 +146,6 @@ Virtual event: We expect to hold formal sessions in at least two time zones, USA about/index.md about/pasthackweeks.md OceanHackWeek 2022 -% resources/index.md +resources/index.md % posts ``` diff --git a/resources/index.md b/resources/index.md index 18e261f8..c98f7fd4 100644 --- a/resources/index.md +++ b/resources/index.md @@ -1,20 +1,25 @@ # Resources -Welcome to [OceanHackWeek](about/index.md) 2021 (OHW21)! OHW21 is a 4-day collaborative learning experience taking place August 3-6, 2021, as a hybrid in-person and virtual event. It is aimed at exploring, creating and promoting effective computation and analysis workflows for large and complex oceanographic data. It includes tutorials, data exploration, software development, collaborative projects and community networking. At our [general web site (https://oceanhackweek.github.io)](https://oceanhackweek.github.io) you can read more about OceanHackWeek, including the [OHW21 organizing committee](https://oceanhackweek.github.io/our-team.html) and links to [events from previous years](https://oceanhackweek.github.io/pasthackweeks.html). +:::{admonition} Updates in progress +:class: warning -**This site is being actively updated this week (week before OHW21)! Some parts are still out of date, and is the content from last year. We'll keep you posted about updates via Slack. In the meantime, please watch out for references to 2020 ("OHW20") or links that don't work.** +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 2021 ("OHW21") or links that don't work. -To make sure that OHW21 will be a welcoming environment for everyone, please read our [Code of Conduct](about/code-of-conduct.md) carefully as part of your preparation. We expect all participants to adhere to the Code of Conduct in all interactions throughout the hackweek. +::: + +To make sure that OHW21 will be a welcoming environment for everyone, please read our [Code of Conduct](/about/code-of-conduct.md) carefully as part of your preparation. We expect all participants to adhere to the Code of Conduct in all interactions throughout the hackweek. ## Schedules -There are three different schedules, corresponding to the **in-person event**, the **main virtual event** and the **Oceania virtual event**. The "Oceania" virtual event is intended to accommodate participants from Australia to India. You will be asked to choose between the two virtual groups. Go to [the Schedule page for details](schedule.md). +There are a few different schedules and participants may need to pay attention to multiple based on if they are part of the global event, or at a satellite. +Go to [the Schedule page for details](schedule.md). ## Preparation -We will use a [JupyterHub](https://jupyter.org/hub)-based online environment for all OceanHackWeek computational activities, including tutorials; this environment supports both Python and R. You will need a robust internet connection and a capable laptop or desktop computer. **On July 29 and 30, we will offer short "pre-hackweek" optional sessions to answer questions on the basics of Git, GitHub, Jupyter and core R and Python scientific libraries, and OceanHackWeek in general. The schedule is available in the [Schedule page](schedule.md#pre-hackweek-optional-check-ins), and the Zoom link will be sent via Slack.** +We will use a [JupyterHub](https://jupyter.org/hub)-based online environment for all OceanHackWeek computational activities, including tutorials; this environment supports both Python and R. You will need a robust internet connection and a capable laptop or desktop computer. + -We will use Slack, Zoom and GitHub as our primary communication and content delivery platforms. The week before OceanHackWeek you will receive via email an invitation to join the OceanHackWeek GitHub organization, [https://github.com/oceanhackweek/](https://github.com/oceanhackweek/). +We will use Slack, Zoom and GitHub as our primary communication and content delivery platforms. The week before OceanHackWeek you will receive via email an invitation to join the OceanHackWeek GitHub organization, [https://github.com/oceanhackweek/](https://github.com/oceanhackweek/) if you have not received it already, along with Slack invites and Zoom connection info. ```{toctree} :maxdepth: 2 @@ -23,7 +28,8 @@ We will use Slack, Zoom and GitHub as our primary communication and content deli logistics/overview logistics/getting_help -logistics/coffeebreaks +schedule +% logistics/coffeebreaks ``` ```{toctree} diff --git a/resources/logistics/getting_help.md b/resources/logistics/getting_help.md index b72d6208..ec98f990 100644 --- a/resources/logistics/getting_help.md +++ b/resources/logistics/getting_help.md @@ -1,16 +1,36 @@ # Getting Help +:::{admonition} Updates in progress +:class: warning + +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 2021 ("OHW21") or links that don't work. + +::: + We know how overwhelming all of this information can be. Here is some for asking questions and figuring out where to turn for help. -You can ask anything on the Slack `#ohw21-general` channel, any time. Organizers and helpers are monitoring this channel, and some of your fellow hackweek participants may be able to help you! Also, feel free to send a direct message on Slack to any of the organizers or helpers. +You can ask anything on the Slack `#ohw22-general` channel, any time. Organizers and helpers are monitoring this channel, and some of your fellow hackweek participants may be able to help you! Also, feel free to send a direct message on Slack to any of the organizers or helpers. ## Helpdesk -We've set up the `#ohw21-helpdesk` Slack channel to ask technical questions (or other types of questions, if you'd like). We will set up some helpdesk Slack user group that you can use to tag your question as, say, about Python. We'll list and describe those groups here. You are also welcome to direct message the helpers if you don't feel comfortable asking questions publicly. +We've set up the `#ohw22-helpdesk` Slack channel to ask technical questions (or other types of questions, if you'd like). + +We will set up some helpdesk Slack user group that you can use to tag your question as, say, about Python. We'll list and describe those groups here. If you know the rough category of help that you may need, please tag one of the helpdesk user groups to get their attention. All help usergroups can be found by typing `@help-` and Slack will prompt with options. + +You are also welcome to direct message the helpers if you don't feel comfortable asking questions publicly. + +### Slack help groups + +- `@help-infrastructure` - For issues regarding the JupyterHub, Slack, Github, and Zoom. +- `@help-projects` - For help with managing projects, for instance asking how to set up a new repo, or organize meetings. +- `@help-python` - Questions about Python programming. +- `@help-r` - Questions about R programming. +- `@help-tutorials` - For help with tutorial logistics, like cloning the notebooks. +- `@help-website` - If there are any issues with the website tag us to take a look. ## During tutorials -- Ask questions on Slack! Use the `#ohw21-tutorials` channel to ask questions or check out answers to questions others have posed. We will use this same channel every day. Several of us will be monitoring this channel and addressing your questions throughout the tutorials +- Ask questions on Slack! Use the `#ohw22-tutorials` channel to ask questions or check out answers to questions others have posed. We will use this same channel every day. Several of us will be monitoring this channel and addressing your questions throughout the tutorials - **Vote up** questions from others to help the moderators prioritize which questions to ask the speaker during tutorials. - Tutorial moderators will mark questions that are best answered by the instructor and ask helpers (and anyone else!) to answer the rest in real time. Then when the instructor ask if there are questions the moderators will read those reserved for the instructor. - Zoom Chat will **not** be available. Ask on Slack! @@ -18,7 +38,7 @@ We've set up the `#ohw21-helpdesk` Slack channel to ask technical questions (or ## Projects -See the [Projects Getting Started page](../projects/steps.md). Feel free to post a question on the `#ohw21_project` channel, too. +See the [Projects Getting Started page](../projects/steps.md). Feel free to post a question on the `#ohw22_project` channel, too. ## Reporting a Code of Conduct violation diff --git a/resources/logistics/overview.md b/resources/logistics/overview.md index bf4803c5..302a9458 100644 --- a/resources/logistics/overview.md +++ b/resources/logistics/overview.md @@ -1,12 +1,12 @@ # Logistics Overview -Some of you will participate in person at the [Bigelow Laboratory for Ocean Sciences](https://www.bigelow.org/) in Maine (US), and others will participate virtually from time zones all over the world. As we have learned throughout the pandemic, each of these gathering styles has strengths and weaknesses. We are committed to providing an engaging and full experience for everyone and will strive to facilitate cross communication and collaboration across all participants. +Some of you will participate in person at various satellite events, and others will participate virtually from time zones all over the world. As we have learned throughout the pandemic, each of these gathering styles has strengths and weaknesses. We are committed to providing an engaging and full experience for everyone and will strive to facilitate cross communication and collaboration across all participants. ## Time -OceanHackWeek 2021 will take place August 3-6. *Pre-hackweek OPTIONAL sessions* will be on July 29-30 as a 1-hour session each day. +OceanHackWeek 2021 will take place August 15-19. -**In-person participants** will gather for full days, 9am - 5pm EDT. 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, *except the first day when we will start 30 minutes earlier*. The **“Oceania” virtual event** is intended to accommodate participants from Australia to India and will take place 12:00pm - 3:00pm AEST / 2:00 - 5:00 UTC. You will be asked to choose between the two virtual groups. +**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. Detailed schedules are available [Schedule page](../schedule.md). diff --git a/resources/prep/conda.md b/resources/prep/conda.md index 365801c2..7727b66f 100644 --- a/resources/prep/conda.md +++ b/resources/prep/conda.md @@ -1,6 +1,13 @@ # Conda and installing Python and R environments -### Overview +:::{admonition} Updates in progress +:class: warning + +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 2021 ("OHW21") or links that don't work. + +::: + +## Overview ### What is Conda? [**Conda**](http://conda.pydata.org/docs/) is an **open source `package` and `environment` management system for any programming languages, but very popular among python community,** @@ -28,16 +35,27 @@ So even though Python is one of the most adaptable, easy-to-use software systems We also provide instructions for using [Anaconda](https://www.continuum.io), which is our recommended Python distribution, for installing and working with Python on your local computer. We can assist in setting up "conda" environments that will simplify the gathering of Python libraries and version specific to the tutorial you are working on. -### Installing Conda Miniconda +## Installing Conda Miniconda + +:::{admonition} For local development +:class: warning + +Conda is already installed on our JupyterHub, so these instructions are for if you wish to get started with developing locally. + +We may not have the ability to support everyone's individual system, so we have the JupyterLab setup so that everyone can work on the same pre-configured platform. + +::: If you don't have conda (either with *Miniconda* or the full *Anaconda Distribution*) already installed **we recommend [installing Miniconda for latest Python 3](https://docs.conda.io/en/latest/miniconda.html).** https://conda.io/projects/conda/en/latest/user-guide/install/index.html -#### Windows +### Windows + Download the proper installer for your Windows platform (64 bits). When installing, you will be asked if you wish to make the Anaconda Python your default Python for Windows. If you do not have any other installation that is a good option. If you want to keep multiple versions of Python on your machine (e.g. ESRI-supplied python, or 64 bit versions of Anaconda), then don't select the option to modify your path or modify your Windows registry settings. -#### Linux and OSX +### Linux and OSX + You may follow manual steps from [here](https://docs.conda.io/en/latest/miniconda.html) similar to the instructions on Windows (see above). Alternatively, you can execute these commands on a terminal shell (in this case, the bash shell): ```bash @@ -51,24 +69,24 @@ export PATH="$HOME/miniconda/bin:$PATH" conda update conda --yes ``` -### Installing Python +## Installing Python -We will be using Python 3.6 or 3.7 during the week (either will work). Since Anaconda (on Linux) expects you to work in the "bash" shell, if this is not already your default shell, you need to set it to be so (use the "chsh -s /bin/bash" command to change your default shell to bash) or just run an instance of bash from the command line before issuing "Conda" commands (/bin/bash or where it is located on your system). +We will be using Python 3.8 or 3.9 during the week (either will work). Since Anaconda (on Linux) expects you to work in the "bash" shell, if this is not already your default shell, you need to set it to be so (use the "chsh -s /bin/bash" command to change your default shell to bash) or just run an instance of bash from the command line before issuing "Conda" commands (/bin/bash or where it is located on your system). If you are already familiar with Python 2.7, you can take a look at the syntax differences [here](http://sebastianraschka.com/Articles/2014_python_2_3_key_diff.html), but the main point to remember is to put the print statements in parentheses: + ```python print('Hello World!') ``` - ``` bash -$ conda create -n py37 python=3.7 +$ conda create -n py39 python=3.9 ``` -To use Python 3.7: +To use Python 3.9: ``` bash -$ conda activate py37 +$ conda activate py39 ``` To check if you have the correct version: @@ -76,5 +94,3 @@ To check if you have the correct version: ``` bash $ python --version ``` - - diff --git a/resources/prep/conda_original.md b/resources/prep/conda_original.md deleted file mode 100644 index 83909e09..00000000 --- a/resources/prep/conda_original.md +++ /dev/null @@ -1,96 +0,0 @@ -# Conda and installing Python and R environments - -### Overview - -### What is Conda? -[**Conda**](http://conda.pydata.org/docs/) is an **open source `package` and `environment` management system for any programming languages, but very popular among python community,** - -The Hub is pre-configured with a customized "environment" of Python and R packages designed to run all the tutorial notebooks, and supporting a broad range of oceanographic applications. This environment is created and managed using the open-source [**Conda** package and environment management system](https://docs.conda.io) for installing multiple versions of software packages together with their dependencies, and convenient switching between environments. Conda runs on Windows, macOS, and Linux: *"Conda quickly installs, runs, and updates packages and their dependencies. Conda easily creates, saves, loads, and switches between environments on your local computer. It was created for Python programs but it can package and distribute software for any language."* - -Conda may be used on your computer as well as the Hub ... - -https://github.com/oceanhackweek/ohw20-tutorials/blob/master/environment.yml - -For Python, the advantage of conda compared to `pip` is that it has a built in environment management system as well as the management of binaries, and non-Python dependencies. - -You do not need administrative or root permissions to install conda if you select a user-writable installation location. - - -In the previous lesson we showed you a cloud-based environment for our work during the hackweek. What happens after the event when you want to go home and work with all the libraries we showed you? You will likely also want to have a functioning version of Python on your local laptop if that is not already in place. So this lesson takes you through our recommended procedure for doing that. We suggest you get this set up in advance so that we can help you troubleshoot when you arrive. - -### Python Software - -Python software is distributed as a series of *libraries* that are called within your code to perform certain tasks. There are many different collections, or *distributions* of Python software. Generally you install a specific distribution of Python and then add additional libraries as you need them. There are also several different *versions* of Python. The two main versions right now are 2.7 and 3.7, although Python 2.7 will not be supported past 2020. Some libraries only work with specific versions of Python. - -So even though Python is one of the most adaptable, easy-to-use software systems, you can see there are still complexities to work out and potential challenges when delivering content to a large group. Therefore we have a number of different ways that we are trying to simplify this process to maximize your learning during the hackweek. - -We also provide instructions for using [Anaconda](https://www.continuum.io), which is our recommended Python distribution, for installing and working with Python on your local computer. We can assist in setting up "conda" environments that will simplify the gathering of Python libraries and version specific to the tutorial you are working on. - -### Installing Miniconda - -##### Windows -Click [here](http://conda.pydata.org/miniconda.html) to download the proper installer for your Windows platform (64 bits). -We recommend to download the Python 3 version of Miniconda. You can still create Python 2 environments using the Python 3 version of Miniconda. - -When installing, you will be asked if you wish to make the Anaconda Python your default Python for Windows. -If you do not have any other installation that is a good option. If you want to keep multiple versions of python on your machine (e.g. ESRI-supplied python, or 64 bit versions of Anaconda), then don't select the option to modify your path or modify your windows registry settings. - -##### Linux and OSX -You may follow manual steps from [here](http://conda.pydata.org/miniconda.html) similar to the instructions on Windows (see above). Alternatively, you can execute these commands on a terminal shell (in this case, the bash shell): - -```bash -# For MacOSX -url=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -# For Linux -url=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -wget $url -O miniconda.sh -bash miniconda.sh -b -p $HOME/miniconda -export PATH="$HOME/miniconda/bin:$PATH" -conda update conda --yes -``` - -### Installing Anaconda (Optional) - -*NOTE: If you don't have time or disk space for the entire distribution do not install Anaconda. Install only [Miniconda](http://conda.pydata.org/miniconda.html), a bootstrap version of Anaconda, which contains only Python, essential packages, and conda. We will provide an environment file to install all the packages necessary for the hackweek.* - -[Anaconda](https://www.anaconda.com/distribution/) is a data science platform that comes with a lot of packages. At its core, Anaconda uses the conda package management system. - -The list of packages included can be found [*here*](https://docs.anaconda.com/anaconda/packages/pkg-docs) - -1. To install Anaconda, please click on the link below for your operating system, and follow the instructions on the [site](https://www.anaconda.com/download/). -2. Once Anaconda installation step is finished run `python` in the command line to test if Anaconda is installed correctly. **Note: For windows, please use the Anaconda prompt as the command line. It should be installed with your installation of Anaconda** -If Anaconda is installed correctly, you should have this prompt, which emphasizes **Anaconda**: - -```bash -$ python -Python 3.7.3|Anaconda custom (x86_64)| (default, Mar 27 2019, 22:11:17) -... -``` - -### Installing Python - -We will be using Python 3.6 or 3.7 during the week (either will work). Since Anaconda (on Linux) expects you to work in the "bash" shell, if this is not already your default shell, you need to set it to be so (use the "chsh -s /bin/bash" command to change your default shell to bash) or just run an instance of bash from the command line before issuing "Conda" commands (/bin/bash or where it is located on your system). - -If you are already familiar with Python 2.7, you can take a look at the syntax differences [here](http://sebastianraschka.com/Articles/2014_python_2_3_key_diff.html), but the main point to remember is to put the print statements in parentheses: -```python -print('Hello World!') -``` - - -``` bash -$ conda create -n py37 python=3.7 -``` - -To use Python 3.7: - -``` bash -$ conda activate py37 -``` - -To check if you have the correct version: - -``` bash -$ python --version -``` - - diff --git a/resources/prep/git.md b/resources/prep/git.md index b8aa5faf..5198bfd9 100644 --- a/resources/prep/git.md +++ b/resources/prep/git.md @@ -1,17 +1,24 @@ # Git Setup and Basics +:::{admonition} Updates in progress +:class: warning + +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 2021 ("OHW21") or links that don't work. + +::: + ## About Git and GitHub [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. -We will use Git and GitHub for collaborative work. Be sure to arrive at {OceanHackWeek with your own [GitHub](https://github.com/) account. +We will use Git and GitHub for collaborative work. Be sure to arrive at OceanHackWeek with your own [GitHub](https://github.com/) account. ## Git Installation * Windows * Install Git for Windows from this [link](https://gitforwindows.org/). For more setup details follow these [instructions](https://carpentries.github.io/workshop-template/#shell) * Mac OS - * Download the [git installer](https://git-scm.com/download/mac) and run it. + * Download the [git installer](https://git-scm.com/download/mac) and run it. * Linux (Debian): `sudo apt install git-all` To test, open the terminal (on Windows, Git Bash) and setup your username and email: @@ -39,7 +46,7 @@ git config --global core.editor "nano -w" ## Git steps and workflows ```{admonition} "Centralized vs Fork-Clone workflows" -Steps 1-5 focus on the Git "centralized workflow". We present it here as an illustration, but **the workflow we recommend for use in {OceanHackWeek is the Git Fork - Clone workflow, discussed in Step 6.** +Steps 1-5 focus on the Git "centralized workflow". We present it here as an illustration, but **the workflow we recommend for use in OceanHackWeek is the Git Fork - Clone workflow, discussed in Step 6.** ``` @@ -51,7 +58,7 @@ On your own or someone in your project group (preferably one who has never done Click `New` and follow the steps: check yes to create a `README.md` file. -* Format project name as `ohw21-proj-myprojectname` (you can change the name later), where `myprojectname` is a brief name for your project +* Format project name as `ohw22-proj-myprojectname` (you can change the name later), where `myprojectname` is a brief name for your project * Invite others to the repo: * `Settings -> Collaborators` * Note to collaborators: you will receive an invitation to your email associated with github.com. If you cannnot find it look for the `bell` notifications on the top right of the website. @@ -61,10 +68,10 @@ Click `New` and follow the steps: check yes to create a `README.md` file. Each participant should clone the repository so they have their copy on their JupyterHub account space (and locally in the participant's computer, if desired). Navigate through the terminal to the folder where you want to keep {OceanHackWeek work (`cd path_to_oceanhackweek`). ```bash -git clone https://github.com/oceanhackweek/ohw21-proj-myprojectname.git +git clone https://github.com/oceanhackweek/ohw22-proj-myprojectname.git ``` -This will create a new folder called `ohw21-proj-myprojectname`. Navigate to the new folder, `ohw21-proj-myprojectname`. +This will create a new folder called `ohw22-proj-myprojectname`. Navigate to the new folder, `ohw22-proj-myprojectname`. ### 3. Update the README with your name @@ -144,10 +151,10 @@ So far you collaborated using what is called a "centralized git workflow": i.e. ![](../img/centralized_workflow_atlasian.png) -Some merge conflicts can be avoided by working with **forks** (using a "forking git workflow) instead of directly pushing to the repo. +Many merge conflicts can be avoided by working with **forks** (using a "forking git workflow) instead of directly pushing to the repo. ```{admonition} "Forking Git Workflow" -This is the workflow covered in the OHW20 pre-hackweek presentation on 2020-8-6. The presentation [pdf is here](https://raw.githubusercontent.com/oceanhackweek/ohw-preweek/master/git-github-survival-guide/Git-GitHub-survival-guide.pdf), and the [recording is here](https://youtu.be/7nYFRixSV2c); **the workflow is the one recommended for use in OHW21.** +This is the workflow covered in the OHW20 pre-hackweek presentation on 2020-8-6. The presentation [pdf is here](https://raw.githubusercontent.com/oceanhackweek/ohw-preweek/master/git-github-survival-guide/Git-GitHub-survival-guide.pdf), and the [recording is here](https://youtu.be/7nYFRixSV2c); **the workflow is the one recommended for use in OHW22.** Here's an excellent guide to the Forking Git Workflow: [Step-by-step guide to contributing on GitHub](https://www.dataschool.io/how-to-contribute-on-github/) ``` @@ -179,6 +186,11 @@ From now on you will push to `origin`, but pull from `upstream`. Make sure your `origin` contains your github username, and upstream contains the `oceanhackweek` name. ``` +```{admonition} Hint +:class: toggle +Github has a handy [command line tool `gh`](https://cli.github.com/). If you fork a repo and use the `gh` command shown on the page to clone the repo, it will set `upstream` and `origin` appropriately for you. +``` + #### Submitting changes via a pull request Make some changes to a file and commit and publish them. diff --git a/resources/prep/github.md b/resources/prep/github.md index 6053c353..ef94d3e1 100644 --- a/resources/prep/github.md +++ b/resources/prep/github.md @@ -1,5 +1,12 @@ # GitHub +:::{admonition} Updates in progress +:class: warning + +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 2021 ("OHW21") or links that don't work. + +::: + ## About Git and GitHub [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. @@ -25,7 +32,7 @@ GitHub organizations are a convenient way for teams to get all content relevant We have created a GitHub organization called oceanhackweek at [https://github.com/oceanhackweek](https://github.com/oceanhackweek). For security purposes you can only join the organization by invitation. You should already have received the invitation to GitHub. If you didn't: -1. Once you have a GitHub ID, send it to Emilio Mayorga on our Slack channel +1. Once you have a GitHub ID, in the `#ohw22-helpdesk` Slack channel ask for help and include `@help-infrastructure` in your message so that folks who have the ability to make changes are notified. 2. We will then send you an invitation which should generate an email notification to the email you provided when you signed up for GitHub 3. Follow the links in the email to accept the invitation diff --git a/resources/prep/jupyterhub.md b/resources/prep/jupyterhub.md index 8b886900..4b366658 100644 --- a/resources/prep/jupyterhub.md +++ b/resources/prep/jupyterhub.md @@ -1,5 +1,12 @@ # JupyterHub +:::{admonition} Updates in progress +:class: warning + +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 2021 ("OHW21") or links that don't work. + +::: + ## Jupyter notebooks and the Jupyter ecosystem You may have heard of [Jupyter](https://en.wikipedia.org/wiki/Project_Jupyter) -- an open computing "ecosystem" developed by [Project Jupyter](https://jupyter.org). This ecosystem is described succinctly and effectively in [the online open book, Teaching and Learning with Jupyter](https://jupyter4edu.github.io/jupyter-edu-book/): @@ -20,7 +27,7 @@ We encourage you to use our shared JupyterHub resources for running all the tuto ## How do I access the shared cloud environment? -Access to our shared cloud environment is easy. Just click on [https://ohw.pilot.2i2c.cloud](https://ohw.pilot.2i2c.cloud) +Access to our shared cloud environment is easy. Click on [https://ohw.pilot.2i2c.cloud](https://ohw.pilot.2i2c.cloud) ![hub-opening](../img/ohw21-jupyterhub-opening.png) diff --git a/resources/projects/overview.md b/resources/projects/overview.md index b40a5fc6..9e1baac1 100644 --- a/resources/projects/overview.md +++ b/resources/projects/overview.md @@ -1,5 +1,12 @@ # Project Overview +:::{admonition} Updates in progress +:class: warning + +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 2021 ("OHW21") or links that don't work. + +::: + Collaborative projects are a key component of OceanHackWeek, in which you get to interact with others closely and apply new skills to make something exciting happen: it can be creating tools to streamline access of a particular data source, visualizing some high density data interactively, testing existing models with new data sources, or anything else you may want to do at the intersection of oceanography and data science. ## What is a Hack? diff --git a/resources/projects/steps.md b/resources/projects/steps.md index 5fd2a1fb..981fe5c0 100644 --- a/resources/projects/steps.md +++ b/resources/projects/steps.md @@ -1,10 +1,17 @@ -# Hacking at OHW21 +# Hacking at OHW22 + +:::{admonition} Updates in progress +:class: warning + +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 2021 ("OHW21") or links that don't work. + +::: ## How will the projects be conducted? -We have put together the [Project proposal form](https://docs.google.com/forms/d/1Q71S1Rae7U_V5BrcSBOiXU1VvNmv7wsjNKBdG5wCEv0/edit) that includes a list of questions that walk you through the few things to consider while setting up a project. Feel free to bounce ideas and form groups in the `#ohw21_project` channel prior to the event, and submit the proposal form when you think you/your team is ready. +We have put together a [few questions](https://github.com/oceanhackweek/discussions/discussions/categories/ohw22-project-planning) that can help you propose a project in [GitHub discussions](https://github.com/oceanhackweek/discussions/discussions/categories/ohw22-project-planning). -On Tuesday August 3 we will have a brief “project setup” session for an overview of all projects already proposed up to that point, and give another opportunity to pitch new ideas that may be formed throughout the day. The deadline to submit project proposals is 3pm PDT / 6pm EDT / 22:00 UTC that day. +On Monday August 15th we will have a brief “project setup” session for an overview of all projects already proposed up to that point, and give another opportunity to pitch new ideas that may be formed throughout the day. The deadline to submit project proposals is 3pm PDT / 6pm EDT / 22:00 UTC that day. ## Tips for getting started diff --git a/resources/schedule.md b/resources/schedule.md index 7de6c58f..454c2d6c 100644 --- a/resources/schedule.md +++ b/resources/schedule.md @@ -1,18 +1,28 @@ # Schedule -OceanHackWeek 2021 will take place August 3-6. *Pre-hackweek OPTIONAL sessions* will be on July 29-30 as a 1-hour session each day ([see below for details](#pre-hackweek-optional-check-ins)). +:::{admonition} Updates in progress +:class: warning +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 2021 ("OHW21") or links that don't work. + +::: + +OceanHackWeek 2022 will take place August 15-19. + +With a global virtual event and many satellites, this schedule is still very much under development. The global virtual event will be meeting from 11-2 Pacific, and most satellites are planning at least part of their day around that time block to encourage cross-satellite interaction. + + - + diff --git a/resources/tutorials/getting_started.md b/resources/tutorials/getting_started.md index 19b189a9..d5510f15 100644 --- a/resources/tutorials/getting_started.md +++ b/resources/tutorials/getting_started.md @@ -1,6 +1,11 @@ # Getting started on tutorials -**THIS PAGE HAS NOT BEEN UPDATED FROM OHW20 YET. CHECK BACK SOON!** +:::{admonition} Updates in progress +:class: warning + +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. + +::: ## Introduction From 33434593fb17e0bfb7e26e0da7c99acc2f69dee7 Mon Sep 17 00:00:00 2001 From: Alex Kerney Date: Wed, 20 Jul 2022 13:09:48 -0400 Subject: [PATCH 2/2] Helps to commit the menu change --- index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.md b/index.md index de9296e6..8aa2ab50 100644 --- a/index.md +++ b/index.md @@ -144,7 +144,7 @@ Virtual event: We expect to hold formal sessions in at least two time zones, USA :hidden: about/index.md -about/pasthackweeks.md +% about/pasthackweeks.md OceanHackWeek 2022 resources/index.md % posts