Merge remote-tracking branch 'upstream/main' into main-local

Author: roelofsaj

.all-contributorsrc

@@ -850,6 +850,17 @@
             "avatar_url": [
                 "https://avatars.githubusercontent.com/u/6353056?v=4"
             ]
+        },
+        {
+            "login": "jperrsau-at-nrel",
+            "name": "jperrsau-at-nrel",
+            "contributions": [
+                "code"
+            ],
+            "profile": "https://github.com/jperrsau-at-nrel",
+            "avatar_url": [
+                "https://avatars.githubusercontent.com/u/171282530?v=4"
+            ]
         }
     ],
     "contributorsPerLine": 7

.github/workflows/linting.yaml

@@ -17,7 +17,7 @@ jobs:
     - name: Check Spelling
       uses: crate-ci/typos@master # we should really incorporate all new changes
       with:
-        files: ./_posts ./pages ./README.md
+        files: ./_posts ./_events ./pages ./README.md
         config: ./.github/workflows/typo_config.toml
 
     - name: URLs-checker
@@ -54,7 +54,10 @@ jobs:
           https://twitter.com/us_rse,\
           https://twitter.com/us_rse/status/1447622175133945860,\
           https://twitter.com/iancosden/status/1122937311644323841,\
-          https://bitcon.blacksintechnology.net/"
+          https://bitcon.blacksintechnology.net/,\
+          https://travel.usnews.com/features/top-pride-parades-and-celebrations-in-the-us,\
+          https://family.20thcenturystudios.com/movies/hidden-figures,\
+          https://www.usatoday.com/story/money/2023/06/07/silicon-valley-tech-black-history-roy-clay/70262081007/"
 
         # Exclude these files from the checker
         exclude_files: "README.md,\

.github/workflows/typo_config.toml

@@ -13,5 +13,10 @@ extend-ignore-re = [
     "Nam Pho",
     "SLAC",
     "Paul Hsi",
-    "NWO"
+    "NWO",
+    "ND",
+    "AAS",
+    "Villegas",
+    "Wil",
+    "Lok"
 ]

.tributors

@@ -432,5 +432,9 @@
         "name": "David Brownell",
         "orcid": "0000-0002-5078-9711",
         "blog": "https://github.com/davidbrownell"
+    },
+    "jperrsau-at-nrel": {
+        "name": "jperrsau-at-nrel",
+        "blog": "https://github.com/jperrsau-at-nrel"
     }
 }

Dockerfile

@@ -1,25 +1,14 @@
-FROM jekyll/jekyll:3.8
-## Currently jekyll/jekyll:4 fails with the error below so tag 3.8 is used instead.
-#      Dockerfile:10
-#      --------------------
-#         8 |     ## Install required gems
-#         9 |     COPY ./Gemfile ./Gemfile
-#        10 | >>> RUN bundle install
-#        11 |     
-#        12 |     ## Copy source files
-#      --------------------
-#      ERROR: failed to solve: process "/bin/sh -c bundle install" 
-#             did not complete successfully: exit code: 5
+FROM jekyll/jekyll:stable
 
 ENV JEKYLL_UID=1000
 ENV JEKYLL_GID=1000
 
-USER ${JEKYLL_UID}
-
 ## Install required gems
 COPY ./Gemfile ./Gemfile
 RUN bundle install
 
+USER ${JEKYLL_UID}
+
 ## Copy source files
 COPY --chown=${JEKYLL_UID}:${JEKYLL_GID} ./ ./
 

Gemfile

@@ -1,10 +1,11 @@
 source "https://rubygems.org"
 
-gem "github-pages", '228', group: :jekyll_plugins
+gem "github-pages", '232', group: :jekyll_plugins
 
 # enable tzinfo-data for local build
 # gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
 gem 'jekyll-paginate', '1.1.0'
-gem 'faraday', '2.7.4'
-gem 'faraday-retry', '2.0.0'
-gem 'webrick', '1.8.1'
+gem 'faraday', '2.10.1'
+gem 'faraday-retry', '2.2.1'
+gem 'webrick', '>=1.8.2'
+

README.md

@@ -3,7 +3,7 @@
 https://us-rse.org
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-79-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-80-orange.svg?style=flat-square)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## What is this?
@@ -93,7 +93,7 @@ What the PR submitter is responsible for:
   * Failed URL check where you know the URL is actually OK: OK to ignore.
   * Failed URL on another page outside of your PR: fix it if you can.  If you can't fix it (not sure what to replace it with, etc.), please note the problem in the PR discussion.  The person who merges the PR may choose to ignore the issue.  
 * Spellchecker: Click on the Details link, then expand the Check Spelling section of the report that comes up to identify the issue.
-  * Spelling issue in a file that is part of the PR: you must fix it.  If it's a legitimate word, you may need to add an exception to [`.github/workflows/typo_config.toml`](.github/workflows/topy_config.toml)
+  * Spelling issue in a file that is part of the PR: you must fix it.  If it's a legitimate word, you may need to add an exception to [`.github/workflows/typo_config.toml`](.github/workflows/typo_config.toml)
   * Spelling issue in a file that is not part of the PR: this generally shouldn't happen, as previous PRs have also had the spellchecker run.   
 
 Questions?  Not sure what to do or what the problem is?  Ask on the #website channel on Slack.  
@@ -224,6 +224,7 @@ tool to generate a contributors graphic below.
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/sanyatonwu"><img src="https://avatars.githubusercontent.com/u/155703270?v=4?s=100" width="100px;" alt="sanyatonwu"/><br /><sub><b>sanyatonwu</b></sub></a><br /><a href="https://github.com/USRSE/usrse.github.io/commits?author=sanyatonwu" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/davidbrownell"><img src="https://avatars.githubusercontent.com/u/6353056?v=4?s=100" width="100px;" alt="David Brownell"/><br /><sub><b>David Brownell</b></sub></a><br /><a href="https://github.com/USRSE/usrse.github.io/commits?author=davidbrownell" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jperrsau-at-nrel"><img src="https://avatars.githubusercontent.com/u/171282530?v=4?s=100" width="100px;" alt="jperrsau-at-nrel"/><br /><sub><b>jperrsau-at-nrel</b></sub></a><br /><a href="https://github.com/USRSE/usrse.github.io/commits?author=jperrsau-at-nrel" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

_data/callouts/home.yml

@@ -8,15 +8,14 @@ items:
       of interest to US-RSE members.
     link: newsletters/
     link_name: Newsletters
-  - title: RSE Career Guide
-    subtitle: A joint publication from US-RSE and the IEEE Computer Society
-    link: https://doi.org/10.5281/zenodo.10073232
-    link_name: >
-      "Research Software Engineers: Creating a Career Path—and a Career"
+  - title: US-RSE Conference 2024
+    subtitle: Join us in Albuquerque, NM, October 15-17
+    link: https://us-rse.org/usrse24/
+    link_name: Conference Page
     link_name: Learn More
-  - title: Community Awards
+  - title: 2024 US-RSE Community Awards Winners Announced
     subtitle: >
-      US-RSE is accepting applications for the US-RSE Excellence in Service
-      and US-RSE Impact Awards! Nominations close on March 29, 2024.
-    link: /community-awards/
+      The 2024 Community Awards winners are: Daniel S. Katz for US-RSE Impact
+      Award and Christina Maimone for US-RSE Excellence in Service Award.
+    link: https://us-rse.org/community-awards/
     link_name: Learn More

_data/internships.yml

@@ -1,21 +1 @@
-- expires: 2024-04-01
-  location: Princeton University, Princeton, NJ
-  name: Associate in Research Software Engineering - Temporary
-  posted: 2024-02-14
-  url: https://main-princeton.icims.com/jobs/18493/associate-in-research-software-engineering---temporary/job
-- expires: 2024-03-08
-  location: Pittsburgh Supercomputing Center, Pittsburgh, PA
-  name: Brain Image Library Student Research Programmer
-  posted: 2024-01-29
-  url: https://www.psc.edu/brain-image-library-student-research-programmer/
-- expires: 2024-03-17
-  location: NCSA, University of Illinois Urbana-Champaign, Urbana, IL
-  name: Summer 2024 research experience for undergraduates (REU) in open source machine
-    learning models and tools
-  posted: 2024-01-05
-  url: https://reu.ncsa.illinois.edu
-- expires: 2024-02-16
-  location: Purdue University, West Lafayette, Indiana
-  name: 2024 Anvil Research Experiences for Undergraduates (REU)
-  posted: 2024-01-04
-  url: https://www.rcac.purdue.edu/anvil/reu
+[]

_data/job-boards.yml

@@ -7,3 +7,5 @@ boards:
     url: https://academicdatascience.org/jobs
   - name: High Performance Computing (HPC) Jobs from hpc.social
     url: https://hpc.social/jobs/
+  - name: SGX3 and SGCI Science Gateways Community Jobs Board
+    url: https://sciencegateways.org/networking-community/jobs