Pin miniforge and upgrade to ottr 1.5.2 (#945)

* fix grading image builds due to mamba changes

* pin miniforge and upgrade to ottr 1.5.2

* fix miniforge url

Author: chrispyles

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+**v6.1.5 (unreleased):**
+
+* Pin miniforge version in grading image to v25.3.1-0
+* Upgrade ottr in grading image to v1.5.2
+
 **v6.1.4:**
 
 * Fixed R assignment grading to assign partial credit for all test cases (restoring an unintended change to pre-v6 behavior) per [#935](https://github.com/ucbds-infra/otter-grader/issues/935)

otter/generate/__init__.py

@@ -23,8 +23,9 @@
 
 DEFAULT_PYTHON_VERSION = "3.12"
 JINJA_ENV = Environment(loader=PackageLoader(__name__), keep_trailing_newline=True)
+MINIFORGE_VERSION = "25.3.1-0"
 OTTER_ENV_NAME = "otter-env"
-OTTR_VERSION = "1.5.0"
+OTTR_VERSION = "1.5.2"
 TEMPLATE_DIR = importlib.resources.files(__name__) / "templates"
 
 
@@ -251,6 +252,7 @@ def main(
         "ottr_version": OTTR_VERSION,
         "channel_priority_strict": channel_priority_strict,
         "has_r_requirements": False,
+        "miniforge_version": MINIFORGE_VERSION,
     }
 
     if plugin_collection is None:

otter/generate/templates/python/setup.sh

@@ -13,9 +13,9 @@ 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/Miniforge3-Linux-aarch64.sh \
+    then wget -nv https://github.com/conda-forge/miniforge/releases/download/{{ miniforge_version }}/Miniforge3-Linux-aarch64.sh \
         -O {{ autograder_dir }}/source/mamba_install.sh ; \
-    else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \
+    else wget -nv https://github.com/conda-forge/miniforge/releases/download/{{ miniforge_version }}/Miniforge3-Linux-x86_64.sh \
         -O {{ autograder_dir }}/source/mamba_install.sh ; \
 fi
 chmod +x {{ autograder_dir }}/source/mamba_install.sh

otter/generate/templates/r/setup.sh

@@ -18,9 +18,9 @@ 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/Miniforge3-Linux-aarch64.sh \
+    then wget -nv https://github.com/conda-forge/miniforge/releases/download/{{ miniforge_version }}/Miniforge3-Linux-aarch64.sh \
         -O {{ autograder_dir }}/source/mamba_install.sh ; \
-    else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \
+    else wget -nv https://github.com/conda-forge/miniforge/releases/download/{{ miniforge_version }}/Miniforge3-Linux-x86_64.sh \
         -O {{ autograder_dir }}/source/mamba_install.sh ; \
 fi
 chmod +x {{ autograder_dir }}/source/mamba_install.sh

test/test_assign/files/example-autograder-correct/setup.sh

@@ -13,9 +13,9 @@ 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/Miniforge3-Linux-aarch64.sh \
+    then wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-aarch64.sh \
         -O /autograder/source/mamba_install.sh ; \
-    else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \
+    else wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-x86_64.sh \
         -O /autograder/source/mamba_install.sh ; \
 fi
 chmod +x /autograder/source/mamba_install.sh

test/test_assign/files/gs-autograder-correct/setup.sh

@@ -13,9 +13,9 @@ 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/Miniforge3-Linux-aarch64.sh \
+    then wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-aarch64.sh \
         -O /autograder/source/mamba_install.sh ; \
-    else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \
+    else wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-x86_64.sh \
         -O /autograder/source/mamba_install.sh ; \
 fi
 chmod +x /autograder/source/mamba_install.sh

test/test_assign/files/rmd-autograder-correct/environment.yml

@@ -23,6 +23,6 @@ dependencies:
   - r-stringi
   - r-testthat
   - r-usethis
-  - r-ottr==1.5.0
+  - r-ottr==1.5.2
   - pip:
       - otter-grader[grading,plugins,r]==6.1.4

test/test_assign/files/rmd-autograder-correct/setup.sh

@@ -18,9 +18,9 @@ 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/Miniforge3-Linux-aarch64.sh \
+    then wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-aarch64.sh \
         -O /autograder/source/mamba_install.sh ; \
-    else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \
+    else wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-x86_64.sh \
         -O /autograder/source/mamba_install.sh ; \
 fi
 chmod +x /autograder/source/mamba_install.sh

test/test_generate/files/autograder-correct/setup.sh

@@ -13,9 +13,9 @@ 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/Miniforge3-Linux-aarch64.sh \
+    then wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-aarch64.sh \
         -O /autograder/source/mamba_install.sh ; \
-    else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \
+    else wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-x86_64.sh \
         -O /autograder/source/mamba_install.sh ; \
 fi
 chmod +x /autograder/source/mamba_install.sh

test/test_generate/files/autograder-custom-env/setup.sh

@@ -13,9 +13,9 @@ 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/Miniforge3-Linux-aarch64.sh \
+    then wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-aarch64.sh \
         -O /autograder/source/mamba_install.sh ; \
-    else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \
+    else wget -nv https://github.com/conda-forge/miniforge/releases/download/25.3.1-0/Miniforge3-Linux-x86_64.sh \
         -O /autograder/source/mamba_install.sh ; \
 fi
 chmod +x /autograder/source/mamba_install.sh