From 6aba912d940716ff6fe7fa7c9b9af2d9cc2a92e0 Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Fri, 22 Mar 2024 18:34:27 -0600 Subject: [PATCH 1/4] Book - Simplify adding a team member An observed challenge over the years was to add many team members to the website at once without creating the dreaded merge conflict. This breaks up the monolithic `team.yaml` file and has each team member fill out their own. This hopefully makes it easier and has the nice side-effect of reusable files across hackweeks and years. --- .gitignore | 2 + book/team.yaml | 176 ------------------------------------- cookiecutter.yaml | 2 +- scripts/build_resources.sh | 1 + scripts/build_team_yaml.sh | 29 ++++++ team/README.md | 17 ++++ team/anthony-arendt.yaml | 24 +++++ team/charley-haley.yaml | 17 ++++ team/don-setiawan.yaml | 25 ++++++ team/header.yaml | 5 ++ team/jessica-scheick.yaml | 29 ++++++ team/joachim-meyer.yaml | 22 +++++ team/naomi-alterman.yaml | 23 +++++ team/scott-henderson.yaml | 21 +++++ team/template.yaml | 17 ++++ 15 files changed, 233 insertions(+), 177 deletions(-) delete mode 100644 book/team.yaml create mode 100755 scripts/build_team_yaml.sh create mode 100644 team/README.md create mode 100644 team/anthony-arendt.yaml create mode 100644 team/charley-haley.yaml create mode 100644 team/don-setiawan.yaml create mode 100644 team/header.yaml create mode 100644 team/jessica-scheick.yaml create mode 100644 team/joachim-meyer.yaml create mode 100644 team/naomi-alterman.yaml create mode 100644 team/scott-henderson.yaml create mode 100644 team/template.yaml diff --git a/.gitignore b/.gitignore index 0dba826f..aeeb83ca 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ # cookiecutter webpage things cookiecutter.json /book/_build/html/assets +## Temporary files created by build scripts +/team/team.yaml # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/book/team.yaml b/book/team.yaml deleted file mode 100644 index 0ad65a36..00000000 --- a/book/team.yaml +++ /dev/null @@ -1,176 +0,0 @@ -description: - The people on this page have helped organize the hackweek. - You'll find a few specializations listed per person if you're wondering who to reach out to during the event! - -# INSTRUCTIONS: -# - One entry per key must be included per person (title, avatar, role, organizations, bio, expertise, social, user_groups) -# - user_groups correspond to hackweek roles defined here: https://uwhackweek.github.io/hackweeks-as-a-service/services/index.html -# - For 'avatar' an easy option is to use the URL for your GitHub user image: https://api.github.com/users/YOUR_GITHUB_USERNAME -people: - - title: Jessica Scheick - avatar: https://avatars.githubusercontent.com/u/11756442?v=4 - role: Research Assistant Professor - organizations: - - name: University of New Hampshire - - name: eScience - bio: Jessica is a glaciologist, remote sensing specialist, open science advocate and educator, - collaborative developer, open-source software contributor and maintainer, and community manager. - She enjoys weaving her many roles together to work with others to build software that makes it easier - for everyone to access and manipulate data, and she's especially fond of detecting icebergs. - expertise: - - open science - - collaborative development - - Python - - git - - GitHub - - glaciers - - ICESat-2/icepyx - social: - - icon: github - icon_pack: fab - link: https://github.com/jessicas11 - - icon: github - icon_pack: fab - link: https://github.com/icesat2py - user_groups: - - Lead Hackweek Organizer - - Tutorial Lead - - Project Team Lead - # ============= - - title: Anthony Arendt - avatar: https://avatars.githubusercontent.com/u/4993098?v=4?s=100 - role: Senior Data Science Fellow - organizations: - - name: eScience Institute - - name: Applied Physics Laboratory - bio: Anthony is leading the eScience Institute's Hackweek-as-a-Service program. - He is an advocate for open, inclusive and collaborative science. - He has experience teaching GIS and has been the lead organizer for multiple earth-science themed hackweeks. - His background is in cryospheric science and remote sensing. - expertise: - - open science - - community building - - GIS - - SQL - - glaciers - - Python - social: - - icon: github - icon_pack: fab - link: https://github.com/aaarendt - user_groups: - - Lead Hackweek Organizer - # ============= - - title: Charley Haley - avatar: https://avatars.githubusercontent.com/u/70242677?v=4 - role: Social Strategist and Collaboration Architect - organizations: - - name: Collaboration Architect at eScience Institute - - name: WayForagers - url: https://WayForagers.org - bio: I am passionate about all things that are in service to building collaborations, especially interdisciplinary ones. - I love building frameworks that make it easier for science groups (research, applied, data, stakeholders) to understand - each other and how they might fit together to address the larger, more complex science challenges that are impossible to - touch without a community of collaborators representing all angles & all perspectives. - expertise: - - Participatory Design and facilitation - - Structuring productive meetings & discussions - - Community development - user_groups: - - Lead Community Building - # ============= - - title: Scott Henderson - avatar: https://avatars2.githubusercontent.com/u/3924836?s=460&v=4 - role: Research Scientist - organizations: - - name: eScience Institute - - name: UW Earth and Space Sciences Department - bio: Scott is a research scientist and data science fellow at the University of Washington. - His research is focused on applications of synthetic aperture radar to understand geophysical processes. - Scott is excited about the potential for open source software and Cloud computing to enable more open and reproducible science. - expertise: - - InSAR - - Jupyter - - Python - - Cloud computing - social: - - icon: github - icon_pack: fab - link: https://github.com/scottyhq - user_groups: - - Lead of Technology - - Tutorial Lead - # ============= - - title: Don Setiawan - avatar: https://avatars.githubusercontent.com/u/17802172?v=4 - role: Research Software Engineer - organizations: - - name: School of Oceanography - url: https://www.ocean.washington.edu/home/Don_Setiawan - - name: University of Washington - bio: I am a Research Software Engineer at the University of Washington with a - strong focus in designing, developing, and maintaining scientific data analysis - systems. I am a contributor to various open source software. I learning new - technologies and apply them in my work. - expertise: - - Geospatial Information Systems (GIS) - - Data Engineering / Data Science - - Software Engineering - - Web Development - - DevOps/GitOps - - Oceanography - - Python - social: - - icon: github - icon_pack: fab - link: https://github.com/lsetiawan - user_groups: - - Technology Specialist - # ============= - - title: Naomi Alterman - avatar: https://escience.washington.edu/wp-content/uploads/2021/01/nlalterman.jpg - role: Education Consultant - organizations: - - name: eScience Institute - bio: > - Naomi is a Technical Education Specialist at the University of - Washington's eScience Institute. She has a background in electrical - engineering and computer science, but loves spending her time working on the - interface between complex domains of information, be they software, hardware, - or people. - expertise: - - Education and pedagogy - - Technical mentorship - - Python - - git - - Cloud computing - social: - - icon: github - icon_pack: fab - link: https://github.com/naclomi - user_groups: - - Education Consultant - # ============= - - title: Joachim Meyer - avatar: https://avatars.githubusercontent.com/u/178649?v=4 - role: Senior Research Scholar - organizations: - - name: Boise State University - bio: > - Joe is a research scientist at Boise State University with a focus - on physical based snow modeling development and operational application. - He has a background in software development and would love to see more - software development best practices, open source software, and open science - principles being adapted throughout the research community. - expertise: - - Software Development - - Python - - git, GDAL, anything in the Terminal really ... - - Modeling - social: - - icon: github - icon_pack: fab - link: https://github.com/jomey - user_groups: - - Technology Specialist - # ============= diff --git a/cookiecutter.yaml b/cookiecutter.yaml index d9785937..2277ca08 100644 --- a/cookiecutter.yaml +++ b/cookiecutter.yaml @@ -28,7 +28,7 @@ about: applicant_info: UW Hackweek 2022 will take place in October 2022 (virtual or in-person TBD). Applications have not yet opened, but should be anticipated in September 2022. team: - !include book/team.yaml + !include team/team.yaml schedule: !include book/schedule.yaml sponsors: diff --git a/scripts/build_resources.sh b/scripts/build_resources.sh index 1a5565cd..0a37d38e 100755 --- a/scripts/build_resources.sh +++ b/scripts/build_resources.sh @@ -14,6 +14,7 @@ if [ -f "$YAML_FILE" ]; then python yaml2json.py "$YAML_FILE" "$JSON_FILE" fi +./build_team_yaml.sh if [ -d "../book/_build/html/assets" ]; then rm -rf ../book/_build/html/assets diff --git a/scripts/build_team_yaml.sh b/scripts/build_team_yaml.sh new file mode 100755 index 00000000..6a17c915 --- /dev/null +++ b/scripts/build_team_yaml.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# +# Create one team yaml file to include with the cookiecutter.yaml +# +# This script is meant to be called only within the 'script' directory + +# Go to the team directory (silently) +pushd ../team/ > /dev/null + +# Merge all individual files, excluding template and header files +find . -type f -name '*.yaml' \ + ! -name team.yaml ! -name team_people.yaml \ + ! -name template.yaml ! -name header.yaml | \ + sort | xargs -I '{}' cat '{}' > team_people.yaml + +# Indent to proper yaml +sed -i 's/^/ /' team_people.yaml + +# Create the final team file +cat header.yaml team_people.yaml > team.yaml + +# Remove temporary files +rm team_people.yaml + +# Go back where we came from +popd > /dev/null + +echo "Team.yaml created" + diff --git a/team/README.md b/team/README.md new file mode 100644 index 00000000..404c08a9 --- /dev/null +++ b/team/README.md @@ -0,0 +1,17 @@ +# The team folder + +All members of the organizing team should add themselves to the webpage and +this folder contains a file for each person describing themselves. + +## Adding a new member +Follow these steps to add yourself: +* Use the provided 'template.yaml' file and copy the file. +* Rename the file to your name + ``` + mv template.yaml FirstName_LastName.yaml + ``` +* Open the file in your favorite editor and fill out the details, +replacing the placeholder text. +* Commit the file and open a pull request +* Don't forget to add a reviewer to the pull request so they get notified. + diff --git a/team/anthony-arendt.yaml b/team/anthony-arendt.yaml new file mode 100644 index 00000000..a03bfef4 --- /dev/null +++ b/team/anthony-arendt.yaml @@ -0,0 +1,24 @@ +- title: Anthony Arendt + avatar: https://avatars.githubusercontent.com/u/4993098?v=4?s=100 + role: Senior Data Science Fellow + organizations: + - name: eScience Institute + - name: Applied Physics Laboratory + bio: Anthony is leading the eScience Institute's Hackweek-as-a-Service program. + He is an advocate for open, inclusive and collaborative science. + He has experience teaching GIS and has been the lead organizer for multiple earth-science themed hackweeks. + His background is in cryospheric science and remote sensing. + expertise: + - open science + - community building + - GIS + - SQL + - glaciers + - Python + social: + - icon: github + icon_pack: fab + link: https://github.com/aaarendt + user_groups: + - Lead Hackweek Organizer + diff --git a/team/charley-haley.yaml b/team/charley-haley.yaml new file mode 100644 index 00000000..45552a12 --- /dev/null +++ b/team/charley-haley.yaml @@ -0,0 +1,17 @@ +- title: Charley Haley + avatar: https://avatars.githubusercontent.com/u/70242677?v=4 + role: Social Strategist and Collaboration Architect + organizations: + - name: Collaboration Architect at eScience Institute + - name: WayForagers + url: https://WayForagers.org + bio: I am passionate about all things that are in service to building collaborations, especially interdisciplinary ones. + I love building frameworks that make it easier for science groups (research, applied, data, stakeholders) to understand + each other and how they might fit together to address the larger, more complex science challenges that are impossible to + touch without a community of collaborators representing all angles & all perspectives. + expertise: + - Participatory Design and facilitation + - Structuring productive meetings & discussions + - Community development + user_groups: + - Lead Community Building diff --git a/team/don-setiawan.yaml b/team/don-setiawan.yaml new file mode 100644 index 00000000..b80f0c6a --- /dev/null +++ b/team/don-setiawan.yaml @@ -0,0 +1,25 @@ +- title: Don Setiawan + avatar: https://avatars.githubusercontent.com/u/17802172?v=4 + role: Research Software Engineer + organizations: + - name: School of Oceanography + url: https://www.ocean.washington.edu/home/Don_Setiawan + - name: University of Washington + bio: I am a Research Software Engineer at the University of Washington with a + strong focus in designing, developing, and maintaining scientific data analysis + systems. I am a contributor to various open source software. I learning new + technologies and apply them in my work. + expertise: + - Geospatial Information Systems (GIS) + - Data Engineering / Data Science + - Software Engineering + - Web Development + - DevOps/GitOps + - Oceanography + - Python + social: + - icon: github + icon_pack: fab + link: https://github.com/lsetiawan + user_groups: + - Technology Specialist diff --git a/team/header.yaml b/team/header.yaml new file mode 100644 index 00000000..804a100f --- /dev/null +++ b/team/header.yaml @@ -0,0 +1,5 @@ +description: + The people on this page have helped organize the hackweek. + You'll find a few specializations listed per person if you're wondering who to reach out to during the event! + +people: diff --git a/team/jessica-scheick.yaml b/team/jessica-scheick.yaml new file mode 100644 index 00000000..de6dfd6c --- /dev/null +++ b/team/jessica-scheick.yaml @@ -0,0 +1,29 @@ +- title: Jessica Scheick + avatar: https://avatars.githubusercontent.com/u/11756442?v=4 + role: Research Assistant Professor + organizations: + - name: University of New Hampshire + - name: eScience + bio: Jessica is a glaciologist, remote sensing specialist, open science advocate and educator, + collaborative developer, open-source software contributor and maintainer, and community manager. + She enjoys weaving her many roles together to work with others to build software that makes it easier + for everyone to access and manipulate data, and she's especially fond of detecting icebergs. + expertise: + - open science + - collaborative development + - Python + - git + - GitHub + - glaciers + - ICESat-2/icepyx + social: + - icon: github + icon_pack: fab + link: https://github.com/jessicas11 + - icon: github + icon_pack: fab + link: https://github.com/icesat2py + user_groups: + - Lead Hackweek Organizer + - Tutorial Lead + - Project Team Lead diff --git a/team/joachim-meyer.yaml b/team/joachim-meyer.yaml new file mode 100644 index 00000000..6548deb4 --- /dev/null +++ b/team/joachim-meyer.yaml @@ -0,0 +1,22 @@ +- title: Joachim Meyer + avatar: https://avatars.githubusercontent.com/u/178649?v=4 + role: Senior Research Scholar + organizations: + - name: Boise State University + bio: > + Joe is a research scientist at Boise State University with a focus + on physical based snow modeling development and operational application. + He has a background in software development and would love to see more + software development best practices, open source software, and open science + principles being adapted throughout the research community. + expertise: + - Software Development + - Python + - git, GDAL, anything in the Terminal really ... + - Modeling + social: + - icon: github + icon_pack: fab + link: https://github.com/jomey + user_groups: + - Technology Specialist diff --git a/team/naomi-alterman.yaml b/team/naomi-alterman.yaml new file mode 100644 index 00000000..f562d35a --- /dev/null +++ b/team/naomi-alterman.yaml @@ -0,0 +1,23 @@ +- title: Naomi Alterman + avatar: https://escience.washington.edu/wp-content/uploads/2021/01/nlalterman.jpg + role: Education Consultant + organizations: + - name: eScience Institute + bio: > + Naomi is a Technical Education Specialist at the University of + Washington's eScience Institute. She has a background in electrical + engineering and computer science, but loves spending her time working on the + interface between complex domains of information, be they software, hardware, + or people. + expertise: + - Education and pedagogy + - Technical mentorship + - Python + - git + - Cloud computing + social: + - icon: github + icon_pack: fab + link: https://github.com/naclomi + user_groups: + - Education Consultant diff --git a/team/scott-henderson.yaml b/team/scott-henderson.yaml new file mode 100644 index 00000000..352d7506 --- /dev/null +++ b/team/scott-henderson.yaml @@ -0,0 +1,21 @@ +- title: Scott Henderson + avatar: https://avatars2.githubusercontent.com/u/3924836?s=460&v=4 + role: Research Scientist + organizations: + - name: eScience Institute + - name: UW Earth and Space Sciences Department + bio: Scott is a research scientist and data science fellow at the University of Washington. + His research is focused on applications of synthetic aperture radar to understand geophysical processes. + Scott is excited about the potential for open source software and Cloud computing to enable more open and reproducible science. + expertise: + - InSAR + - Jupyter + - Python + - Cloud computing + social: + - icon: github + icon_pack: fab + link: https://github.com/scottyhq + user_groups: + - Lead of Technology + - Tutorial Lead diff --git a/team/template.yaml b/team/template.yaml new file mode 100644 index 00000000..38028d87 --- /dev/null +++ b/team/template.yaml @@ -0,0 +1,17 @@ +- title: Your name goes here + avatar: A URL with your picture + role: Your title + organizations: + - name: Your institution + bio: A short bio about yourself. + You can have multiple lines. Just watch that you have two leading spaces at the beginning. + expertise: + - skill 1 + - skill 2 + social: + - icon: github + icon_pack: fab + link: Link to your GitHub profile + user_groups: + - The role in the hackweek. Examples: Tutorial Lead, Project Helper + From 9f680a1a69dda7ba3912c1a989df0c98ba175437 Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Fri, 22 Mar 2024 18:44:19 -0600 Subject: [PATCH 2/4] Build scripts - Need to build team before JSON conversion --- scripts/build_resources.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_resources.sh b/scripts/build_resources.sh index 0a37d38e..5df30256 100755 --- a/scripts/build_resources.sh +++ b/scripts/build_resources.sh @@ -9,13 +9,13 @@ if [ -f "$JSON_FILE" ]; then echo "Removed JSON file" fi +./build_team_yaml.sh + if [ -f "$YAML_FILE" ]; then echo "Converting yaml to json" python yaml2json.py "$YAML_FILE" "$JSON_FILE" fi -./build_team_yaml.sh - if [ -d "../book/_build/html/assets" ]; then rm -rf ../book/_build/html/assets echo "Removed jupyterbook assets" From 79a0d9906aa2c3de6b3c1b56235cf70a3edccc8d Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Mon, 25 Mar 2024 13:34:23 -0600 Subject: [PATCH 3/4] Team - ReadMe - Incorporate review suggestions. Co-authored-by: aaarendt --- team/README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/team/README.md b/team/README.md index 404c08a9..4a421680 100644 --- a/team/README.md +++ b/team/README.md @@ -6,12 +6,11 @@ this folder contains a file for each person describing themselves. ## Adding a new member Follow these steps to add yourself: * Use the provided 'template.yaml' file and copy the file. -* Rename the file to your name +* Create a copy of the 'template.yaml' file and rename the file to your name ``` - mv template.yaml FirstName_LastName.yaml + cp template.yaml FirstName_LastName.yaml ``` -* Open the file in your favorite editor and fill out the details, -replacing the placeholder text. +* Open the new file you just created in your favorite editor and fill out the + details, replacing the placeholder text. * Commit the file and open a pull request * Don't forget to add a reviewer to the pull request so they get notified. - From 2e68ff106b18769a273b4ce4b7d6537e1c146aeb Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Mon, 25 Mar 2024 13:51:02 -0600 Subject: [PATCH 4/4] Team - Simplify YAML, remove key from social Remove the 'icon_pack' key from the YAML file to simplify editing. The css key is now hard-coded to the HTML. Note that the current used version of fontawesome does not have an icon for X (aka Twitter) yet. --- cookiecutter.yaml | 1 - team/anthony-arendt.yaml | 1 - team/don-setiawan.yaml | 1 - team/jessica-scheick.yaml | 2 -- team/joachim-meyer.yaml | 1 - team/naomi-alterman.yaml | 1 - team/scott-henderson.yaml | 1 - team/template.yaml | 5 ++++- {{ cookiecutter.repo_directory }}/index.html | 6 +++--- 9 files changed, 7 insertions(+), 12 deletions(-) diff --git a/cookiecutter.yaml b/cookiecutter.yaml index 2277ca08..416384e1 100644 --- a/cookiecutter.yaml +++ b/cookiecutter.yaml @@ -40,7 +40,6 @@ sponsors: footer: social: - icon: github - icon_pack: fab link: https://github.com/uwhackweek/ _copy_without_render: - assets diff --git a/team/anthony-arendt.yaml b/team/anthony-arendt.yaml index a03bfef4..4d7e8bb9 100644 --- a/team/anthony-arendt.yaml +++ b/team/anthony-arendt.yaml @@ -17,7 +17,6 @@ - Python social: - icon: github - icon_pack: fab link: https://github.com/aaarendt user_groups: - Lead Hackweek Organizer diff --git a/team/don-setiawan.yaml b/team/don-setiawan.yaml index b80f0c6a..37cba547 100644 --- a/team/don-setiawan.yaml +++ b/team/don-setiawan.yaml @@ -19,7 +19,6 @@ - Python social: - icon: github - icon_pack: fab link: https://github.com/lsetiawan user_groups: - Technology Specialist diff --git a/team/jessica-scheick.yaml b/team/jessica-scheick.yaml index de6dfd6c..d8c0229c 100644 --- a/team/jessica-scheick.yaml +++ b/team/jessica-scheick.yaml @@ -18,10 +18,8 @@ - ICESat-2/icepyx social: - icon: github - icon_pack: fab link: https://github.com/jessicas11 - icon: github - icon_pack: fab link: https://github.com/icesat2py user_groups: - Lead Hackweek Organizer diff --git a/team/joachim-meyer.yaml b/team/joachim-meyer.yaml index 6548deb4..cebb0b6b 100644 --- a/team/joachim-meyer.yaml +++ b/team/joachim-meyer.yaml @@ -16,7 +16,6 @@ - Modeling social: - icon: github - icon_pack: fab link: https://github.com/jomey user_groups: - Technology Specialist diff --git a/team/naomi-alterman.yaml b/team/naomi-alterman.yaml index f562d35a..fb2e7104 100644 --- a/team/naomi-alterman.yaml +++ b/team/naomi-alterman.yaml @@ -17,7 +17,6 @@ - Cloud computing social: - icon: github - icon_pack: fab link: https://github.com/naclomi user_groups: - Education Consultant diff --git a/team/scott-henderson.yaml b/team/scott-henderson.yaml index 352d7506..47a13a9b 100644 --- a/team/scott-henderson.yaml +++ b/team/scott-henderson.yaml @@ -14,7 +14,6 @@ - Cloud computing social: - icon: github - icon_pack: fab link: https://github.com/scottyhq user_groups: - Lead of Technology diff --git a/team/template.yaml b/team/template.yaml index 38028d87..cd1a716b 100644 --- a/team/template.yaml +++ b/team/template.yaml @@ -10,8 +10,11 @@ - skill 2 social: - icon: github - icon_pack: fab link: Link to your GitHub profile + - icon: twitter + link: Link to your Twitter profile + - icon: linkedin + link: Link to your LinkedIn profile user_groups: - The role in the hackweek. Examples: Tutorial Lead, Project Helper diff --git a/{{ cookiecutter.repo_directory }}/index.html b/{{ cookiecutter.repo_directory }}/index.html index 29f118e5..baf3bd99 100644 --- a/{{ cookiecutter.repo_directory }}/index.html +++ b/{{ cookiecutter.repo_directory }}/index.html @@ -398,7 +398,7 @@
{{ person['title'] }}
{%- for social in person['social'] %}
  • - +
    • {%- endfor %} @@ -452,7 +452,7 @@

    {%- for social in person['social'] %}
  • - +
    • {%- endfor %} @@ -541,7 +541,7 @@

    Our Sponsors

    {%- for soc in cookiecutter.footer['social'] %}
  • - +
    • {%- endfor %}