Merge pull request #769 from chrispyles/fix-709

ucbds-infra · Jan 27, 2024 · f3407bf · f3407bf
2 parents 4189aa0 + 96e975f
commit f3407bf
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Fixed an error causing intercell seeding code to be added to cells using cell magic commands which caused syntax errors per [#754](https://github.com/ucbds-infra/otter-grader/issues/754)
 * Add support for submitting the PDF uploaded in a submission for manual grading instead of generating a new one per [#764](https://github.com/ucbds-infra/otter-grader/issues/764)
 * Validate that a course ID and assignment ID were provided before attempting PDF upload
+* Upgrade and pin pandoc to v3.1.11.1 in grading images per [#709](https://github.com/ucbds-infra/otter-grader/issues/709)
 
 **v5.2.3:**
 

diff --git a/docs/_static/python_setup.sh b/docs/_static/python_setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/docs/_static/r_setup.sh b/docs/_static/r_setup.sh
@@ -3,14 +3,19 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 apt-get install -y libnlopt-dev cmake libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev \
     apt-utils libpoppler-cpp-dev libavfilter-dev  libharfbuzz-dev libfribidi-dev imagemagick \
-    libmagick++-dev pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+    libmagick++-dev texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese \
     libxft-dev
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/otter/generate/templates/python/setup.sh b/otter/generate/templates/python/setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/otter/generate/templates/r/setup.sh b/otter/generate/templates/r/setup.sh
@@ -3,14 +3,19 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 apt-get install -y libnlopt-dev cmake libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev \
     apt-utils libpoppler-cpp-dev libavfilter-dev  libharfbuzz-dev libfribidi-dev imagemagick \
-    libmagick++-dev pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+    libmagick++-dev texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese \
     libxft-dev
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_assign/files/example-autograder-correct/setup.sh b/test/test_assign/files/example-autograder-correct/setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_assign/files/gs-autograder-correct/setup.sh b/test/test_assign/files/gs-autograder-correct/setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_assign/files/rmd-autograder-correct/setup.sh b/test/test_assign/files/rmd-autograder-correct/setup.sh
@@ -3,14 +3,19 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 apt-get install -y libnlopt-dev cmake libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev \
     apt-utils libpoppler-cpp-dev libavfilter-dev  libharfbuzz-dev libfribidi-dev imagemagick \
-    libmagick++-dev pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+    libmagick++-dev texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese \
     libxft-dev
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_generate/files/autograder-correct/setup.sh b/test/test_generate/files/autograder-correct/setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_generate/files/autograder-custom-env/setup.sh b/test/test_generate/files/autograder-custom-env/setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_generate/files/autograder-r-correct/setup.sh b/test/test_generate/files/autograder-r-correct/setup.sh
@@ -3,14 +3,19 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 apt-get install -y libnlopt-dev cmake libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev \
     apt-utils libpoppler-cpp-dev libavfilter-dev  libharfbuzz-dev libfribidi-dev imagemagick \
-    libmagick++-dev pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+    libmagick++-dev texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese \
     libxft-dev
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_generate/files/autograder-r-requirements-correct/setup.sh b/test/test_generate/files/autograder-r-requirements-correct/setup.sh
@@ -3,14 +3,19 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 apt-get install -y libnlopt-dev cmake libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev \
     apt-utils libpoppler-cpp-dev libavfilter-dev  libharfbuzz-dev libfribidi-dev imagemagick \
-    libmagick++-dev pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+    libmagick++-dev texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese \
     libxft-dev
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_generate/files/autograder-token-correct/setup.sh b/test/test_generate/files/autograder-token-correct/setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \

diff --git a/test/test_run/files/autograder/source/setup.sh b/test/test_run/files/autograder/source/setup.sh
@@ -3,9 +3,14 @@
 export DEBIAN_FRONTEND=noninteractive
 apt-get clean
 apt-get update
-apt-get install -y wget pandoc texlive-xetex texlive-fonts-recommended texlive-plain-generic \
+apt-get install -y wget texlive-xetex texlive-fonts-recommended texlive-plain-generic \
     build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev texlive-lang-chinese
 
+# install pandoc
+wget -nv https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb \
+    -O /tmp/pandoc.deb
+dpkg -i /tmp/pandoc.deb
+
 # install mamba
 if [ $(uname -p) = "arm" ] || [ $(uname -p) = "aarch64" ] ; \
     then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh \