Merge branch 'main' of github.com:UBC-DSCI/dsci-310-student

docs/check-setup-310.log

@@ -0,0 +1,184 @@
+# DSCI 310 setup check 2023.1
+
+## Operating system
+ProductName:		macOS
+ProductVersion:		13.4
+BuildVersion:		22F66
+
+## System programs
+MISSING   rstudio 2023.06.*
+OK        R 4.3.2 (2023-10-31) -- "Eye Holes"
+OK        python 3.11.6
+OK        conda 23
+OK        bash 3.2.57(1)-release (arm64-apple-darwin22)
+OK        git 2.39.2 (Apple Git-143)
+OK        make 3.81
+OK        latex 3.141592653-2.6-1.40.25 (TeX Live 2023)
+OK        tlmgr 5:21 +0200)
+OK        docker 24.0.6, build ed223bc
+OK        code 1.85.0
+
+## Python packages
+OK        otter-grader=5.2.2
+OK        pandas=2.1.1
+OK        nbconvert-core=7.8.0
+MISSING   playwright=1.*
+OK        jupyterlab=4.0.6
+OK        jupyterlab-git=0.41.0
+OK        jupyterlab-spellchecker=0.8.4
+OK        jupyterlab PDF-generation was successful.
+MISSING   jupyterlab WebPDF-generation failed. It seems like you did not run `pip install "nbconvert[webpdf]"`.
+OK        jupyterlab HTML-generation was successful.
+
+## R packages
+OK        tidyverse=2.0.0
+OK        markdown=1.7
+OK        rmarkdown=2.24
+OK        renv=1.0.2
+OK        IRkernel=1.3.2
+OK        tinytex=0.46
+OK        janitor=2.2.0
+OK        gapminder=1.0.0
+OK        readxl=1.4.3
+OK        ottr=1.1.3
+OK        canlang=0.0.1
+OK        rmarkdown PDF-generation was successful.
+OK        rmarkdown HTML-generation was successful.
+
+## Environmental variables
+GIT_PS1_SHOWDIRTYSTATE=1
+TERM_PROGRAM=Apple_Terminal
+TERM=xterm-256color
+SHELL=/bin/bash
+CLICOLOR=1
+TMPDIR=/var/folders/yx/296325p15r92zgg4zc7px5qh0000gp/T/
+CONDA_SHLVL=1
+TERM_PROGRAM_VERSION=447
+CONDA_PROMPT_MODIFIER=(base) 
+TERM_SESSION_ID=AEF44705-253D-4AE4-A5F6-ED5FC1859015
+GITHUB_COM_PAT=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
+USER=timberst
+CONDA_EXE=/Users/timberst/miniconda3/bin/conda
+SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.92mmfw0xBh/Listeners
+GITHUB_PAT=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
+BASH_SILENCE_DEPRECATION_WARNING=1
+_CE_CONDA=
+LSCOLORS=ExGxFxdxCxDxDxxbaDecac
+PATH=/Users/timberst/.cargo/bin:/Users/timberst/miniconda3/bin:/Users/timberst/miniconda3/condabin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Applications/quarto/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin
+XML_CATALOG_FILES=file:///Users/timberst/miniconda3/etc/xml/catalog file:///etc/xml/catalog
+__CFBundleIdentifier=com.apple.Terminal
+CONDA_PREFIX=/Users/timberst/miniconda3
+PWD=/Users/timberst/Documents/dsci-310/dsci-310-student
+LANG=en_CA.UTF-8
+XPC_FLAGS=0x0
+XPC_SERVICE_NAME=0
+_CE_M=
+HOME=/Users/timberst
+SHLVL=2
+LOGNAME=timberst
+CONDA_PYTHON_EXE=/Users/timberst/miniconda3/bin/python
+CONDA_DEFAULT_ENV=base
+DISPLAY=/private/tmp/com.apple.launchd.l13hPiudL2/org.xquartz:0
+CANVAS_PAT=11224~Emah7Zet5Y4iuDzUL4tA8jfbFjQHyM1LPgNBsAHElKeBf92MRecO5qWanEqtv5uF
+_=/usr/bin/env
+
+## Content of .bash_profile
+# Set the default editor for programs launch from terminal
+EDITOR="code --wait"
+VISUAL=$EDITOR  # Use the same value as for "EDITOR" in the line above
+git config --global core.editor "code --wait"
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/Users/timberst/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/Users/timberst/miniconda3/etc/profile.d/conda.sh" ]; then
+        . "/Users/timberst/miniconda3/etc/profile.d/conda.sh"
+    else
+        export PATH="/Users/timberst/miniconda3/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+
+# Silence default shell note when launching bash
+export BASH_SILENCE_DEPRECATION_WARNING=1
+
+# Load the git prompt script
+source ~/.git-prompt.sh
+# Show unstaged (*) and staged (+) changes in the prompt string
+export GIT_PS1_SHOWDIRTYSTATE=1
+
+# Color text so it is easier to distinguish elements from each other
+export CLICOLOR=1
+export LSCOLORS=ExGxFxdxCxDxDxxbaDecac
+# Color the prompt string and add git info
+export PS1=${CONDA_PROMPT_MODIFIER}'\[\033[01;32m\]\u@\h\[\033[01;35m\] \w\[\033[34m\]$(__git_ps1 " (%s)")\[\033[00m\]\n\$ '
+
+# TAB completion configuration
+# TAB completion ignores case
+bind "set completion-ignore-case on"
+# Require only one instead of two TAB presses before showing matches
+bind "set show-all-if-ambiguous on"
+# Unfortunately the tab cycling does not work together with single tab match expansion on macOS
+# since bash is too old, so I have commented out the option below,
+# but feel free to remove the leading `#` if you want to test it out.
+# If there are multiple matches for completion, cycle through them with TAB
+# bind 'TAB':menu-complete
+
+# History configuration
+# Cycle through history based on characters already typed on the line
+bind '"\e[A":history-search-backward'
+bind '"\e[B":history-search-forward'
+# Append to the history file, don't overwrite it.
+shopt -s histappend
+# Write commands to history one-by-one right after they are executed
+# instead of all together when the terminal is closed.
+# Make new terminals see all commands run in currently open terminals and
+# prepend a newline to the prompt string to separate it from the last command's output
+PROMPT_COMMAND='history -a; echo'
+# Increase history size
+HISTSIZE=50000
+HISTFILESIZE=50000
+
+# Aliases and functions
+# Note that aliases only are in effect when you are using the shell interactively
+# (e.g. opening the terminal and typing or pasting commands).
+# If you run a bash script or makefile,
+# the original command is used instead of your alias.
+# ---
+# MDS help script
+alias mds-help='bash ~/.mds-help.sh'
+# Some common operations
+alias l='ls -lthAF'
+alias jl='jupyter lab'
+alias ca='conda activate'
+alias gl='git log --date short -10 --pretty=format:"%C(auto,yellow)%h %C(auto,blue)%ad%C(auto)%d %C(auto,reset)%s"'
+alias gt='git status'
+alias gm='git commit -m'
+alias gap='git add -p'
+# Move, remove, and copy show what was done and prompt before overwriting files.
+alias rm="rm -vi"
+alias mv="mv -vi"
+alias cp="cp -vi"
+alias mkdir="mkdir -vp"
+# Case insensitive grep by default
+alias grep='grep -i'
+. "$HOME/.cargo/env"
+
+#Github enterprise token
+export GITHUB_PAT='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'
+
+# Canvas enterprise token
+export CANVAS_PAT='11224~Emah7Zet5Y4iuDzUL4tA8jfbFjQHyM1LPgNBsAHElKeBf92MRecO5qWanEqtv5uF'
+
+#Github.com org token
+export GITHUB_COM_PAT='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'
+## Content of .bashrc
+# Do NOT add anything to this file, use `~/.bash_profile` instead.
+# The next line automatically loads your `~/.bash_profile`
+# any time a program tries to read your `~/.bashrc` file.
+if [ -f ~/.bash_profile ]; then . ~/.bash_profile; fi
+. "$HOME/.cargo/env"

docs/computer-setup.html

@@ -2527,11 +2527,11 @@ <h2 id="laptop-requirements">Laptop requirements</h2>
 <h2 id="software-installation-instructions">Software installation instructions</h2>
 <p>Please click the appropriate link below to view the installation instructions for your operating system:</p>
 <ul>
-<li><a href="install_stack_mac_x86.html">macOS x86</a> or <a href="install_stack_mac_arm.html">macOS arm</a></li>
+<li><a href="install_stack_mac.html">macOS arm</a></li>
 <li><a href="install_stack_ubuntu.html">Ubuntu</a></li>
 <li><a href="install_stack_windows.html">Windows</a></li>
 </ul>
-<p><em>The following people contributed to these instructions: Anmol Jawandha, Tomas Beuzen, Rodolfo Lourenzutti, Joel Ostblom, Arman Seyed-Ahmadi, Florencia D’Andrea, and Tiffany Timbers.</em></p>
+<p><em>The following people contributed to these instructions: Daniel Chen, Anmol Jawandha, Tomas Beuzen, Rodolfo Lourenzutti, Joel Ostblom, Arman Seyed-Ahmadi, Florencia D’Andrea, and Tiffany Timbers.</em></p>
 <div class="sourceCode" id="cb1"><pre class="sourceCode r distill-force-highlighting-css"><code class="sourceCode r"></code></pre></div>
 <!--radix_placeholder_article_footer-->
 <!--/radix_placeholder_article_footer-->