Merge branch 'main' into main

.github/actions/buildresources/action.yaml

@@ -40,20 +40,25 @@ runs:
       run: |
         if (test -a book/_build/html/reports/*log); then cat book/_build/html/reports/*log ; fi
 
-    - name: Publish to GitHub Pages
+    - name: Upload Pages HTML
       if: inputs.publish-to-gh == 'true'
-      uses: peaceiris/actions-gh-pages@v3
+      uses: actions/upload-pages-artifact@v3
       with:
-        github_token: ${{github.token}}
-        publish_dir: book/_build/html
-        publish_branch: gh-pages
-        enable_jekyll: false
-        cname: book-template.hackweek.io
+        path: book/_build/html
 
-    - name: Save Build
+    - name: Setup GitHub Pages
+      if: inputs.publish-to-gh == 'true'
+      uses: actions/configure-pages@v5
+
+    - name: Deploy to GitHub Pages
+      if: inputs.publish-to-gh == 'true'
+      id: deployment
+      uses: actions/deploy-pages@v4
+
+    - name: Upload Complete Build Folder
       if: ${{ always() && inputs.jb-save == 'true'}}
       uses: actions/upload-artifact@v4
       with:
-        name: build-${{ inputs.os }}
+        name: build-${{ runner.os }}
         path: book/_build/
 

.github/workflows/build_website.yaml

@@ -49,4 +49,3 @@ jobs:
         jb-cache: false
         publish-to-gh: false
         jb-save: true
-        os: ${{ matrix.os }}

.github/workflows/deploy.yaml

@@ -1,6 +1,13 @@
 name: Deploy
 
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
 on:
+  workflow_dispatch:
   push:
     paths:
       - 'book/**'
@@ -15,7 +22,8 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-
+    environment:
+      name: github-pages
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -34,4 +42,4 @@ jobs:
         jb-cache: false
         publish-to-gh: true
         jb-save: true
-        token:  ${{ secrets.GH_PAT }}
+        token:  ${{ secrets.GITHUB_TOKEN }}

.github/workflows/template-sync.yaml

@@ -22,12 +22,13 @@ jobs:
         # comment token (and add .github path to .templatesyncignore)
         # if you do not want actions and workflows updated
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_PAT }}
 
       - name: actions-template-sync
         uses: AndreasAugustin/actions-template-sync@v2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_repo_path: uwhackweek/jupyterbook-template
           upstream_branch: main # defaults to main
-          is_force_deletion: True
+          is_force_deletion: True
+          git_remote_pull_params: --allow-unrelated-histories --squash --strategy=recursive -X theirs

README.md

@@ -24,8 +24,8 @@ You can use this template for your own event!
 
 1. Click the "Use this template" button at the top of the repo
 1. Select the account where you'd like to use the template.
-1. **Be sure to select the checkbox to include all branches!** Otherwise your book will not be rendered automatically. You can remove all branches except for `main` and `gh-pages` from your new repo.
-1. In your new repo, go to Settings > Pages to find the link to your JupyterBook. We recommend adding this link to the home page.
+1. In your new repo, got to Settings --> Pages --> Source = GitHub Actions
+  1. Enter a Custom Domain if you have one, or use the default GitHub Pages URL
 1. There are a few files you'll need to edit to customize content for your event:
   * `cookiecutter.yaml`:  customize your landing page content
   * `book/_config.yml`:  customize your JupyterBook content

book/preliminary/git.md

@@ -30,7 +30,7 @@ Set your username and email address. The email address should be the same
 as you used to register your GitHub account.
 
 ```{attention}
-Use your personal name instead of the placeholder `{{hackweek}} Attendee`
+Use your personal name instead of the placeholder `Attendee Name`
 in the below commands. For the email, it should be the address you used to create
 your GitHub account instead of `[email protected]`. Both values need to be
 surrounded by quotes `"`.
@@ -61,7 +61,7 @@ command.
 The output should look similar to this:
 ```shell
 jovyan@jupyter:~$ git config -l
-user.name= Attendee Name
+user.name=Attendee Name
 [email protected]
 credential.helper=store
 ```

conda/conda-linux-64.lock.yml

@@ -22,8 +22,8 @@ dependencies:
   - beautifulsoup4=4.12.3=pyha770c72_0
   - binaryornot=0.4.4=py_1
   - bleach=6.1.0=pyhd8ed1ab_0
-  - blinker=1.7.0=pyhd8ed1ab_0
-  - branca=0.7.1=pyhd8ed1ab_0
+  - blinker=1.8.2=pyhd8ed1ab_0
+  - branca=0.7.2=pyhd8ed1ab_0
   - brotli-python=1.1.0=py312h30efb56_1
   - bzip2=1.0.8=hd590300_5
   - ca-certificates=2024.2.2=hbcca054_0
@@ -38,7 +38,7 @@ dependencies:
   - colorama=0.4.6=pyhd8ed1ab_0
   - comm=0.2.2=pyhd8ed1ab_0
   - cookiecutter=2.6.0=pyhca7485f_0
-  - cryptography=42.0.5=py312h241aef2_0
+  - cryptography=42.0.7=py312hbcc2302_0
   - dataclasses=0.8=pyhc8e2a94_3
   - debugpy=1.8.1=py312h30efb56_0
   - decorator=5.1.1=pyhd8ed1ab_0
@@ -52,124 +52,128 @@ dependencies:
   - h11=0.14.0=pyhd8ed1ab_0
   - h2=4.1.0=pyhd8ed1ab_0
   - hpack=4.0.0=pyh9f0ad1d_0
-  - httpcore=1.0.4=pyhd8ed1ab_0
+  - httpcore=1.0.5=pyhd8ed1ab_0
   - httpx=0.27.0=pyhd8ed1ab_0
   - hyperframe=6.0.1=pyhd8ed1ab_0
-  - idna=3.6=pyhd8ed1ab_0
+  - idna=3.7=pyhd8ed1ab_0
   - imagesize=1.4.1=pyhd8ed1ab_0
-  - importlib-metadata=7.0.2=pyha770c72_0
-  - importlib_metadata=7.0.2=hd8ed1ab_0
-  - importlib_resources=6.3.0=pyhd8ed1ab_0
+  - importlib-metadata=7.1.0=pyha770c72_0
+  - importlib_metadata=7.1.0=hd8ed1ab_0
+  - importlib_resources=6.4.0=pyhd8ed1ab_0
   - ipykernel=6.29.3=pyhd33586a_0
-  - ipyleaflet=0.18.2=pyhd8ed1ab_0
+  - ipyleaflet=0.19.0=pyhd8ed1ab_1
   - ipython=8.22.2=pyh707e725_0
   - ipywidgets=8.1.2=pyhd8ed1ab_0
   - isoduration=20.11.0=pyhd8ed1ab_0
   - jedi=0.19.1=pyhd8ed1ab_0
   - jinja2=3.1.3=pyhd8ed1ab_0
-  - json5=0.9.22=pyhd8ed1ab_0
+  - json5=0.9.25=pyhd8ed1ab_0
   - jsonpointer=2.4=py312h7900ff3_3
-  - jsonschema=4.21.1=pyhd8ed1ab_0
+  - jsonschema=4.22.0=pyhd8ed1ab_0
   - jsonschema-specifications=2023.12.1=pyhd8ed1ab_0
-  - jsonschema-with-format-nongpl=4.21.1=pyhd8ed1ab_0
+  - jsonschema-with-format-nongpl=4.22.0=pyhd8ed1ab_0
   - jupyter-book=1.0.0=pyhd8ed1ab_0
   - jupyter-cache=1.0.0=pyhd8ed1ab_0
-  - jupyter-lsp=2.2.4=pyhd8ed1ab_0
+  - jupyter-lsp=2.2.5=pyhd8ed1ab_0
   - jupyter-resource-usage=1.0.2=pyhd8ed1ab_0
   - jupyter_client=8.6.1=pyhd8ed1ab_0
   - jupyter_core=5.7.2=py312h7900ff3_0
-  - jupyter_events=0.9.1=pyhd8ed1ab_0
-  - jupyter_server=2.13.0=pyhd8ed1ab_0
+  - jupyter_events=0.10.0=pyhd8ed1ab_0
+  - jupyter_leaflet=0.19.0=pyhd8ed1ab_1
+  - jupyter_server=2.14.0=pyhd8ed1ab_0
   - jupyter_server_terminals=0.5.3=pyhd8ed1ab_0
   - jupyter_telemetry=0.1.0=pyhd8ed1ab_1
-  - jupyterhub-base=4.0.2=pyh31011fe_0
-  - jupyterhub-singleuser=4.0.2=pyh31011fe_0
-  - jupyterlab=4.1.5=pyhd8ed1ab_0
+  - jupyterhub-base=4.1.5=pyh31011fe_0
+  - jupyterhub-singleuser=4.1.5=pyh31011fe_0
+  - jupyterlab=4.2.0=pyhd8ed1ab_0
   - jupyterlab_pygments=0.3.0=pyhd8ed1ab_1
-  - jupyterlab_server=2.25.4=pyhd8ed1ab_0
+  - jupyterlab_server=2.27.1=pyhd8ed1ab_0
   - jupyterlab_widgets=3.0.10=pyhd8ed1ab_0
-  - jupytext=1.16.1=pyhd8ed1ab_0
+  - jupytext=1.16.2=pyhd8ed1ab_1
+  - keyutils=1.6.1=h166bdaf_0
+  - krb5=1.21.2=h659d440_0
   - latexcodec=2.0.1=pyh9f0ad1d_0
-  - ld_impl_linux-64=2.40=h41732ed_0
+  - ld_impl_linux-64=2.40=h55db66e_0
+  - libedit=3.1.20191231=he28a2e2_2
   - libexpat=2.6.2=h59595ed_0
   - libffi=3.4.2=h7f98852_5
-  - libgcc-ng=13.2.0=h807b86a_5
-  - libgomp=13.2.0=h807b86a_5
+  - libgcc-ng=13.2.0=h77fa898_7
+  - libgomp=13.2.0=h77fa898_7
   - libnsl=2.0.1=hd590300_0
   - libsodium=1.0.18=h36c2ea0_1
-  - libsqlite=3.45.2=h2797004_0
-  - libstdcxx-ng=13.2.0=h7e041cc_5
+  - libsqlite=3.45.3=h2797004_0
+  - libstdcxx-ng=13.2.0=hc0a3c3a_7
   - libuuid=2.38.1=h0b41bf4_0
   - libxcrypt=4.4.36=hd590300_1
   - libzlib=1.2.13=hd590300_5
   - linkify-it-py=2.0.3=pyhd8ed1ab_0
-  - mako=1.3.2=pyhd8ed1ab_0
+  - mako=1.3.3=pyhd8ed1ab_0
   - markdown=3.6=pyhd8ed1ab_0
   - markdown-it-py=3.0.0=pyhd8ed1ab_0
   - markupsafe=2.1.5=py312h98912ed_0
-  - matplotlib-inline=0.1.6=pyhd8ed1ab_0
+  - matplotlib-inline=0.1.7=pyhd8ed1ab_0
   - mdit-py-plugins=0.4.0=pyhd8ed1ab_0
   - mdurl=0.1.2=pyhd8ed1ab_0
   - mistune=3.0.2=pyhd8ed1ab_0
-  - myst-nb=1.0.0=pyhd8ed1ab_0
+  - myst-nb=1.1.0=pyhd8ed1ab_0
   - myst-parser=2.0.0=pyhd8ed1ab_0
   - nbclient=0.10.0=pyhd8ed1ab_0
-  - nbconvert-core=7.16.2=pyhd8ed1ab_0
-  - nbformat=5.10.3=pyhd8ed1ab_0
-  - ncurses=6.4=h59595ed_2
+  - nbconvert-core=7.16.4=pyhd8ed1ab_0
+  - nbformat=5.10.4=pyhd8ed1ab_0
+  - ncurses=6.4.20240210=h59595ed_0
   - nest-asyncio=1.6.0=pyhd8ed1ab_0
   - notebook-shim=0.2.4=pyhd8ed1ab_0
   - oauthlib=3.2.2=pyhd8ed1ab_0
-  - openssl=3.2.1=hd590300_0
+  - openssl=3.3.0=hd590300_0
   - overrides=7.7.0=pyhd8ed1ab_0
   - packaging=24.0=pyhd8ed1ab_0
   - pamela=1.1.0=pyh1a96a4e_0
   - pandocfilters=1.5.0=pyhd8ed1ab_0
-  - parso=0.8.3=pyhd8ed1ab_0
+  - parso=0.8.4=pyhd8ed1ab_0
   - pexpect=4.9.0=pyhd8ed1ab_0
   - pickleshare=0.7.5=py_1003
   - pip=24.0=pyhd8ed1ab_0
   - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1
-  - platformdirs=4.2.0=pyhd8ed1ab_0
+  - platformdirs=4.2.1=pyhd8ed1ab_0
   - prometheus_client=0.20.0=pyhd8ed1ab_0
   - prompt-toolkit=3.0.42=pyha770c72_0
   - psutil=5.9.8=py312h98912ed_0
   - ptyprocess=0.7.0=pyhd3deb0d_0
   - pure_eval=0.2.2=pyhd8ed1ab_0
   - pybtex=0.24.0=pyhd8ed1ab_2
   - pybtex-docutils=1.0.3=py312h7900ff3_1
-  - pycparser=2.21=pyhd8ed1ab_0
+  - pycparser=2.22=pyhd8ed1ab_0
   - pydata-sphinx-theme=0.15.2=pyhd8ed1ab_0
-  - pygments=2.17.2=pyhd8ed1ab_0
+  - pygments=2.18.0=pyhd8ed1ab_0
   - pyjwt=2.8.0=pyhd8ed1ab_1
-  - pymdown-extensions=10.7.1=pyhd8ed1ab_0
+  - pymdown-extensions=10.8.1=pyhd8ed1ab_0
   - pyopenssl=24.0.0=pyhd8ed1ab_0
   - pysocks=1.7.1=pyha2e5f31_6
-  - python=3.12.2=hab00c5b_0_cpython
+  - python=3.12.3=hab00c5b_0_cpython
   - python-dateutil=2.9.0=pyhd8ed1ab_0
   - python-fastjsonschema=2.19.1=pyhd8ed1ab_0
   - python-json-logger=2.0.7=pyhd8ed1ab_0
   - python-slugify=8.0.4=pyhd8ed1ab_0
   - python_abi=3.12=4_cp312
   - pytz=2024.1=pyhd8ed1ab_0
   - pyyaml=6.0.1=py312h98912ed_1
-  - pyzmq=25.1.2=py312h886d080_0
+  - pyzmq=26.0.3=py312h8fd38d8_0
   - readline=8.2=h8228510_1
-  - referencing=0.33.0=pyhd8ed1ab_0
+  - referencing=0.35.1=pyhd8ed1ab_0
   - requests=2.31.0=pyhd8ed1ab_0
   - rfc3339-validator=0.1.4=pyhd8ed1ab_0
   - rfc3986-validator=0.1.1=pyh9f0ad1d_0
   - rich=13.7.1=pyhd8ed1ab_0
-  - rpds-py=0.18.0=py312h4b3b743_0
+  - rpds-py=0.18.1=py312h4413252_0
   - ruamel.yaml=0.18.6=py312h98912ed_0
   - ruamel.yaml.clib=0.2.8=py312h98912ed_0
-  - send2trash=1.8.2=pyh41d4057_0
-  - setuptools=69.2.0=pyhd8ed1ab_0
+  - send2trash=1.8.3=pyh0d859eb_0
+  - setuptools=69.5.1=pyhd8ed1ab_0
   - six=1.16.0=pyh6c4a22f_0
   - sniffio=1.3.1=pyhd8ed1ab_0
   - snowballstemmer=2.2.0=pyhd8ed1ab_0
   - soupsieve=2.5=pyhd8ed1ab_1
-  - sphinx=7.2.6=pyhd8ed1ab_0
+  - sphinx=7.3.7=pyhd8ed1ab_0
   - sphinx-book-theme=1.1.2=pyhd8ed1ab_0
   - sphinx-comments=0.0.3=pyh9f0ad1d_0
   - sphinx-copybutton=0.5.2=pyhd8ed1ab_0
@@ -186,21 +190,20 @@ dependencies:
   - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_0
   - sphinxcontrib-qthelp=1.0.7=pyhd8ed1ab_0
   - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_0
-  - sqlalchemy=2.0.28=py312h98912ed_0
+  - sqlalchemy=2.0.30=py312h9a8786e_0
   - stack_data=0.6.2=pyhd8ed1ab_0
   - tabulate=0.9.0=pyhd8ed1ab_1
   - terminado=0.18.1=pyh0d859eb_0
   - text-unidecode=1.3=pyhd8ed1ab_1
-  - tinycss2=1.2.1=pyhd8ed1ab_0
+  - tinycss2=1.3.0=pyhd8ed1ab_0
   - tk=8.6.13=noxft_h4845f30_101
-  - toml=0.10.2=pyhd8ed1ab_0
   - tomli=2.0.1=pyhd8ed1ab_0
   - tornado=6.4=py312h98912ed_0
-  - traitlets=5.14.2=pyhd8ed1ab_0
+  - traitlets=5.14.3=pyhd8ed1ab_0
   - traittypes=0.2.1=pyh9f0ad1d_2
-  - types-python-dateutil=2.9.0.20240315=pyhd8ed1ab_0
-  - typing-extensions=4.10.0=hd8ed1ab_0
-  - typing_extensions=4.10.0=pyha770c72_0
+  - types-python-dateutil=2.9.0.20240316=pyhd8ed1ab_0
+  - typing-extensions=4.11.0=hd8ed1ab_0
+  - typing_extensions=4.11.0=pyha770c72_0
   - typing_utils=0.1.0=pyhd8ed1ab_0
   - tzdata=2024a=h0c530f3_0
   - uc-micro-py=1.0.3=pyhd8ed1ab_0
@@ -209,13 +212,13 @@ dependencies:
   - wcwidth=0.2.13=pyhd8ed1ab_0
   - webcolors=1.13=pyhd8ed1ab_0
   - webencodings=0.5.1=pyhd8ed1ab_2
-  - websocket-client=1.7.0=pyhd8ed1ab_0
-  - wheel=0.42.0=pyhd8ed1ab_0
+  - websocket-client=1.8.0=pyhd8ed1ab_0
+  - wheel=0.43.0=pyhd8ed1ab_1
   - widgetsnbextension=4.0.10=pyhd8ed1ab_0
-  - xyzservices=2023.10.1=pyhd8ed1ab_0
+  - xyzservices=2024.4.0=pyhd8ed1ab_0
   - xz=5.2.6=h166bdaf_0
   - yaml=0.2.5=h7f98852_2
-  - zeromq=4.3.5=h59595ed_1
+  - zeromq=4.3.5=h75354e8_3
   - zipp=3.17.0=pyhd8ed1ab_0
   - pip:
       - jinja-markdown === 1.210911 --hash=sha256:cce8e2be016227c925a8c82a7f3499099319d239fedc481b7728a7c9e9e3cfcc