From b751087e00028c1769248ff6af1c76738de004d3 Mon Sep 17 00:00:00 2001 From: Chris Pyles <40970945+chrispyles@users.noreply.github.com> Date: Tue, 1 Oct 2024 12:59:19 -0700 Subject: [PATCH] Switch from mambaforge to miniforge (#847) * switch from mambaforge to miniforge * change mambaforge to miniforge path --- CHANGELOG.md | 4 ++ docs/_static/python_setup.sh | 4 +- docs/_static/r_setup.sh | 4 +- .../generate/templates/common/run_autograder | 6 +-- otter/generate/templates/python/setup.sh | 8 ++-- otter/generate/templates/r/setup.sh | 8 ++-- otter/grade/Dockerfile | 5 ++ otter/run/run_autograder/autograder_config.py | 44 +++++++++--------- test/files/partial-dockerfile.txt | 2 +- .../example-autograder-correct/run_autograder | 6 +-- .../files/example-autograder-correct/setup.sh | 8 ++-- .../gs-autograder-correct/run_autograder | 6 +-- .../files/gs-autograder-correct/setup.sh | 8 ++-- .../rmd-autograder-correct/run_autograder | 6 +-- .../files/rmd-autograder-correct/setup.sh | 8 ++-- .../files/autograder-correct/run_autograder | 6 +-- .../files/autograder-correct/setup.sh | 8 ++-- .../autograder-custom-env/run_autograder | 6 +-- .../files/autograder-custom-env/setup.sh | 8 ++-- .../files/autograder-r-correct/run_autograder | 6 +-- .../files/autograder-r-correct/setup.sh | 8 ++-- .../run_autograder | 6 +-- .../setup.sh | 8 ++-- .../autograder-token-correct/run_autograder | 6 +-- .../files/autograder-token-correct/setup.sh | 8 ++-- test/test_grade/files/autograder.zip | Bin 0 -> 6882 bytes .../files/results/fails1and3and6.txt | 6 +-- test/test_grade/files/results/fails6.txt | 2 +- .../files/autograder/source/run_autograder | 6 +-- .../test_run/files/autograder/source/setup.sh | 8 ++-- 30 files changed, 114 insertions(+), 105 deletions(-) create mode 100644 test/test_grade/files/autograder.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index 98ef68218..3c74144b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +**v5.7.0:** + +* Switch grading image from Mambaforge to Miniforge due to the [sunestting of Mambaforge](https://conda-forge.org/news/2024/07/29/sunsetting-mambaforge/) per [#846](https://github.com/ucbds-infra/otter-grader/issues/846) + **v5.6.0:** * Updated Otter Grade to write grading summary for each notebook per [#814](https://github.com/ucbds-infra/otter-grader/issues/814) diff --git a/docs/_static/python_setup.sh b/docs/_static/python_setup.sh index 4f172e148..cfa20e2ab 100644 --- a/docs/_static/python_setup.sh +++ b/docs/_static/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/Mambaforge-Linux-aarch64.sh \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh diff --git a/docs/_static/r_setup.sh b/docs/_static/r_setup.sh index e0163b71c..479eebc2a 100644 --- a/docs/_static/r_setup.sh +++ b/docs/_static/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/Mambaforge-Linux-aarch64.sh \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh diff --git a/otter/generate/templates/common/run_autograder b/otter/generate/templates/common/run_autograder index 9531ce83e..f8a667183 100644 --- a/otter/generate/templates/common/run_autograder +++ b/otter/generate/templates/common/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate {{ otter_env_name }} python {{ autograder_dir }}/source/run_otter.py diff --git a/otter/generate/templates/python/setup.sh b/otter/generate/templates/python/setup.sh index f05dc8d5b..96e02ae4d 100644 --- a/otter/generate/templates/python/setup.sh +++ b/otter/generate/templates/python/setup.sh @@ -13,16 +13,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O {{ autograder_dir }}/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O {{ autograder_dir }}/source/mamba_install.sh ; \ fi chmod +x {{ autograder_dir }}/source/mamba_install.sh {{ autograder_dir }}/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/otter/generate/templates/r/setup.sh b/otter/generate/templates/r/setup.sh index b0d0fafa2..7bfcec7a7 100644 --- a/otter/generate/templates/r/setup.sh +++ b/otter/generate/templates/r/setup.sh @@ -18,16 +18,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O {{ autograder_dir }}/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O {{ autograder_dir }}/source/mamba_install.sh ; \ fi chmod +x {{ autograder_dir }}/source/mamba_install.sh {{ autograder_dir }}/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba{% if channel_priority_strict %} diff --git a/otter/grade/Dockerfile b/otter/grade/Dockerfile index ea78fbe07..4c71da9ee 100644 --- a/otter/grade/Dockerfile +++ b/otter/grade/Dockerfile @@ -25,3 +25,8 @@ RUN dos2unix /autograder/run_autograder /autograder/source/setup.sh && \ ADD otter_config.json run_otter.py /autograder/source/ ADD files* /autograder/source/files/ ADD tests /autograder/source/tests/ + +ENV PATH=/root/miniforge3/bin:$PATH +ADD __otter-grader /tmp/otter-grader +RUN mamba run -n otter-env pip install /tmp/otter-grader +RUN rm -rf /tmp/* diff --git a/otter/run/run_autograder/autograder_config.py b/otter/run/run_autograder/autograder_config.py index c048c1b8f..c8d07d370 100644 --- a/otter/run/run_autograder/autograder_config.py +++ b/otter/run/run_autograder/autograder_config.py @@ -14,8 +14,8 @@ class AutograderConfig(fica.Config): ) points_possible = fica.Key( - description="a custom total score for the assignment; if unspecified the sum of question " \ - "point values is used.", + description="a custom total score for the assignment; if unspecified the sum of question " + "point values is used.", default=None, ) @@ -45,20 +45,20 @@ class AutograderConfig(fica.Config): ) grade_from_log = fica.Key( - description="whether to re-assemble the student's environment from the log rather than " \ - "by re-executing their submission", + description="whether to re-assemble the student's environment from the log rather than " + "by re-executing their submission", default=False, ) serialized_variables = fica.Key( - description="a mapping of variable names to type strings for validating a deserialized " \ - "student environment", + description="a mapping of variable names to type strings for validating a deserialized " + "student environment", default=None, ) pdf = fica.Key( - description="whether to generate a PDF of the notebook when not using Gradescope " \ - "auto-upload", + description="whether to generate a PDF of the notebook when not using Gradescope " + "auto-upload", default=False, ) @@ -105,7 +105,7 @@ class AutograderConfig(fica.Config): miniconda_path = fica.Key( description="the path to the mamba install directory", - default="/root/mambaforge", + default="/root/miniforge3", ) plugins = fica.Key( @@ -134,39 +134,39 @@ class AutograderConfig(fica.Config): ) log_level = fica.Key( - description="a log level for logging messages; any value suitable for " \ - "``logging.Logger.setLevel``", + description="a log level for logging messages; any value suitable for " + "``logging.Logger.setLevel``", default=None, ) assignment_name = fica.Key( - description="a name for the assignment to ensure that students submit to the correct " \ - "autograder", + description="a name for the assignment to ensure that students submit to the correct " + "autograder", default=None, ) warn_missing_pdf = fica.Key( - description="whether to add a 0-point public test to the Gradescope output to indicate " \ - "to students whether a PDF was found/generated for this assignment", + description="whether to add a 0-point public test to the Gradescope output to indicate " + "to students whether a PDF was found/generated for this assignment", default=False, ) force_public_test_summary = fica.Key( - description="whether to show a summary of public test case results when show_hidden is " \ - "true", + description="whether to show a summary of public test case results when show_hidden is " + "true", default=True, ) submit_blank_pdf_on_export_failure = fica.Key( - description="whether to submit a blank PDF to the manual-grading Gradescope assignment " \ - "if a PDF cannot be generated from the submission", + description="whether to submit a blank PDF to the manual-grading Gradescope assignment " + "if a PDF cannot be generated from the submission", default=False, ) use_submission_pdf = fica.Key( - description="use the PDF in the submission zip file instead of exporting a new one; if " \ - "no PDF is present, a new one is generated anyway; assumes there is only 1 PDF file " \ - "in the submission", + description="use the PDF in the submission zip file instead of exporting a new one; if " + "no PDF is present, a new one is generated anyway; assumes there is only 1 PDF file " + "in the submission", default=False, ) diff --git a/test/files/partial-dockerfile.txt b/test/files/partial-dockerfile.txt index 7d0118062..cfc24f2c3 100644 --- a/test/files/partial-dockerfile.txt +++ b/test/files/partial-dockerfile.txt @@ -1,4 +1,4 @@ -ENV PATH=/root/mambaforge/bin:$PATH +ENV PATH=/root/miniforge3/bin:$PATH ADD __otter-grader /tmp/otter-grader RUN mamba run -n otter-env pip install /tmp/otter-grader RUN rm -rf /tmp/* diff --git a/test/test_assign/files/example-autograder-correct/run_autograder b/test/test_assign/files/example-autograder-correct/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_assign/files/example-autograder-correct/run_autograder +++ b/test/test_assign/files/example-autograder-correct/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_assign/files/example-autograder-correct/setup.sh b/test/test_assign/files/example-autograder-correct/setup.sh index 944af6054..6446d359c 100644 --- a/test/test_assign/files/example-autograder-correct/setup.sh +++ b/test/test_assign/files/example-autograder-correct/setup.sh @@ -13,16 +13,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_assign/files/gs-autograder-correct/run_autograder b/test/test_assign/files/gs-autograder-correct/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_assign/files/gs-autograder-correct/run_autograder +++ b/test/test_assign/files/gs-autograder-correct/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_assign/files/gs-autograder-correct/setup.sh b/test/test_assign/files/gs-autograder-correct/setup.sh index 944af6054..6446d359c 100644 --- a/test/test_assign/files/gs-autograder-correct/setup.sh +++ b/test/test_assign/files/gs-autograder-correct/setup.sh @@ -13,16 +13,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_assign/files/rmd-autograder-correct/run_autograder b/test/test_assign/files/rmd-autograder-correct/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_assign/files/rmd-autograder-correct/run_autograder +++ b/test/test_assign/files/rmd-autograder-correct/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_assign/files/rmd-autograder-correct/setup.sh b/test/test_assign/files/rmd-autograder-correct/setup.sh index 532bc01c6..ca2b8b5c8 100644 --- a/test/test_assign/files/rmd-autograder-correct/setup.sh +++ b/test/test_assign/files/rmd-autograder-correct/setup.sh @@ -18,16 +18,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_generate/files/autograder-correct/run_autograder b/test/test_generate/files/autograder-correct/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_generate/files/autograder-correct/run_autograder +++ b/test/test_generate/files/autograder-correct/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_generate/files/autograder-correct/setup.sh b/test/test_generate/files/autograder-correct/setup.sh index 944af6054..6446d359c 100644 --- a/test/test_generate/files/autograder-correct/setup.sh +++ b/test/test_generate/files/autograder-correct/setup.sh @@ -13,16 +13,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_generate/files/autograder-custom-env/run_autograder b/test/test_generate/files/autograder-custom-env/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_generate/files/autograder-custom-env/run_autograder +++ b/test/test_generate/files/autograder-custom-env/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_generate/files/autograder-custom-env/setup.sh b/test/test_generate/files/autograder-custom-env/setup.sh index 944af6054..6446d359c 100644 --- a/test/test_generate/files/autograder-custom-env/setup.sh +++ b/test/test_generate/files/autograder-custom-env/setup.sh @@ -13,16 +13,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_generate/files/autograder-r-correct/run_autograder b/test/test_generate/files/autograder-r-correct/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_generate/files/autograder-r-correct/run_autograder +++ b/test/test_generate/files/autograder-r-correct/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_generate/files/autograder-r-correct/setup.sh b/test/test_generate/files/autograder-r-correct/setup.sh index 98c0b488a..e1fd2b0ef 100644 --- a/test/test_generate/files/autograder-r-correct/setup.sh +++ b/test/test_generate/files/autograder-r-correct/setup.sh @@ -18,16 +18,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_generate/files/autograder-r-requirements-correct/run_autograder b/test/test_generate/files/autograder-r-requirements-correct/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_generate/files/autograder-r-requirements-correct/run_autograder +++ b/test/test_generate/files/autograder-r-requirements-correct/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_generate/files/autograder-r-requirements-correct/setup.sh b/test/test_generate/files/autograder-r-requirements-correct/setup.sh index 8a2164a85..863c9cd04 100644 --- a/test/test_generate/files/autograder-r-requirements-correct/setup.sh +++ b/test/test_generate/files/autograder-r-requirements-correct/setup.sh @@ -18,16 +18,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_generate/files/autograder-token-correct/run_autograder b/test/test_generate/files/autograder-token-correct/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_generate/files/autograder-token-correct/run_autograder +++ b/test/test_generate/files/autograder-token-correct/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_generate/files/autograder-token-correct/setup.sh b/test/test_generate/files/autograder-token-correct/setup.sh index 944af6054..6446d359c 100644 --- a/test/test_generate/files/autograder-token-correct/setup.sh +++ b/test/test_generate/files/autograder-token-correct/setup.sh @@ -13,16 +13,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O /autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O /autograder/source/mamba_install.sh ; \ fi chmod +x /autograder/source/mamba_install.sh /autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba diff --git a/test/test_grade/files/autograder.zip b/test/test_grade/files/autograder.zip new file mode 100644 index 0000000000000000000000000000000000000000..e3f1930225986c8a5847bd09a43c1c36808fc51e GIT binary patch literal 6882 zcmd5BOKc=Zbv6kR(@B89MnTG@(z_C4WxLxmV^6Y1USX6hiI%LLl@)K6wZ)w zhw?)*^yI{#(}>76ylFZjj+GNJ&PK5q(>|hZT*NWckZ~$}N{*mVB95}v*uW24O`n8C zT6vMjIPoNzA2kd%BCgB5h`KJ>+$5&!BBtw_8wP=A9=&7MWHeXiC3-9VoBz{CS}kl} z1c@Y7X##3qw4=qAzWCC&U)j3uUcIq>efOp7FK+UfGY)FiN~VUFC~Hg=@k8qIvX>?S z=)deTE|nLC#F~-Yh^*)|WQWw6Qur!+qnImc3F^mDM0r4iawG{sU|_?kU_N<6i#<$P z7+9cS$`$iM60)J6ig3*u^Hhb>3g{uircu}{zNHL{&oNUOxL8W)@v-Gk7^jjN#syL= zIq`T9`-Wb&1=c=MDv=wG0~1Wrp$%(w_Q#Qvp*ezr8YGoY5Z~ru>;+EW?%G}W%Q38? zZ*?s%3I=O-K!>?R);4iel;oH=UxJMVZ)`W1b?-3f9t!9r&G(zc!Ig* z9MO1D=E7;HD11`OFbVsF9%5D9u$JuokX$dmywKyDJF-G&L;ZPQ1;Ess)^1+`?aN!KCupa?l7TK~FF=9G@j1#;L&MlVph0aR0KIz&m#`eap1q!P9N4|} zGh#Z(S@s9VGsOKUL_evJ-BQTj1BG0Y=bm1dDg9V9RB!6j5q2ZrHd9egU|g?*W{I{d zI3m#6&;;%p?LFgeWw!r*`%mBd-Ti;UzdGC}|PR9@~ zJ2&@oFVc|<{k?s9(Sm0@@7z6mo;SONpgPu`#F&uwOl;}xm0w=`J2)=3n)CLTHl_ZV zSkg38=2;jJTsEg089UpyNjnj6oOa9^P0ZY+5R7-V1z0?WkXb{^<^kI5W0Bc^UP3uW zmX%lT|7r&;0b9))o?qG;o}agd`B0uqdg2R6o>8h>K}5&};!mi5K-9#8)C)mO7WoYg zj#qne9n#V0m}6UCPR_&)|M+&JA>xI9*n3XW@6 zu@i5}hz;Q~3crv#t5|e$7r^Txr&HB|5y;v$$tr=2a~{;q_UJ5J`vI$j%#XNWH$*_H zOgr7xm80HWN|H;rnyow+Ab<5TU_X21_tY11%pBUwar zyQL-VE~nikS)O`)#hUM5e*D+hehr5jwlBk#xsj`52E9=$sQMF+b2#F$25FIij=VHf zQg>>FBBNd~$WXIN>}KD-tdSFz=r?58jt z6|NrwT$Ny!%(7`pNaU#`j1?3FOAwaqJmiy21vIx=0M*F~1l*EYi6E&rj0LayK09E_ zf`VTSxX<{$*DG=O5QI9UqFNdsLL7zFlqdm%sz-NB2EywVbH>w;I_t$^#qu)OX`&u+jjyfN)vAr*2eg~*cU;u}n0$0Es_S{3~ zA3pxS0x+3=?t#TL|3}cIZPwB=%2w;%xkrH-OV~way-C@uSyz", line 1, in x @@ -100,7 +100,7 @@ q3 results: print("nope") Exception raised: Traceback (most recent call last): - File "/root/mambaforge/envs/otter-env/lib/python3.9/doctest.py", line 1334, in __run + File "/root/miniforge3/envs/otter-env/lib/python3.9/doctest.py", line 1334, in __run exec(compile(example.source, filename, "single", File "", line 1, in if x: @@ -155,7 +155,7 @@ q6 results: print(next(fib)) Exception raised: Traceback (most recent call last): - File "/root/mambaforge/envs/otter-env/lib/python3.9/doctest.py", line 1334, in __run + File "/root/miniforge3/envs/otter-env/lib/python3.9/doctest.py", line 1334, in __run exec(compile(example.source, filename, "single", File "", line 2, in print(next(fib)) diff --git a/test/test_grade/files/results/fails6.txt b/test/test_grade/files/results/fails6.txt index c1f127592..423084bfc 100644 --- a/test/test_grade/files/results/fails6.txt +++ b/test/test_grade/files/results/fails6.txt @@ -55,7 +55,7 @@ q6 results: print(next(fib)) Exception raised: Traceback (most recent call last): - File "/root/mambaforge/envs/otter-env/lib/python3.9/doctest.py", line 1334, in __run + File "/root/miniforge3/envs/otter-env/lib/python3.9/doctest.py", line 1334, in __run exec(compile(example.source, filename, "single", File "", line 2, in print(next(fib)) diff --git a/test/test_run/files/autograder/source/run_autograder b/test/test_run/files/autograder/source/run_autograder index 46cccf7d2..e15425e42 100644 --- a/test/test_run/files/autograder/source/run_autograder +++ b/test/test_run/files/autograder/source/run_autograder @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH="/root/mambaforge/bin:$PATH" -source /root/mambaforge/etc/profile.d/conda.sh -source /root/mambaforge/etc/profile.d/mamba.sh +export PATH="/root/miniforge3/bin:$PATH" +source /root/miniforge3/etc/profile.d/conda.sh +source /root/miniforge3/etc/profile.d/mamba.sh mamba activate otter-env python /autograder/source/run_otter.py diff --git a/test/test_run/files/autograder/source/setup.sh b/test/test_run/files/autograder/source/setup.sh index be122bda3..8afb51a23 100644 --- a/test/test_run/files/autograder/source/setup.sh +++ b/test/test_run/files/autograder/source/setup.sh @@ -13,16 +13,16 @@ 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 \ + then wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh \ -O test/test_run/files/autograder/source/mamba_install.sh ; \ - else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \ + else wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ -O test/test_run/files/autograder/source/mamba_install.sh ; \ fi chmod +x test/test_run/files/autograder/source/mamba_install.sh test/test_run/files/autograder/source/mamba_install.sh -b -echo "export PATH=/root/mambaforge/bin:\$PATH" >> /root/.bashrc +echo "export PATH=/root/miniforge3/bin:\$PATH" >> /root/.bashrc -export PATH=/root/mambaforge/bin:$PATH +export PATH=/root/miniforge3/bin:$PATH export TAR="/bin/tar" # install dependencies with mamba