From fe5d35a2ae7f7ffd5386878d2268625e8d734eaa Mon Sep 17 00:00:00 2001 From: Chris Pyles Date: Thu, 21 Jan 2021 11:39:08 -0800 Subject: [PATCH 01/10] fixing build --- otter/generate/templates/r/environment.yml | 1 + otter/generate/templates/r/setup.sh | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/otter/generate/templates/r/environment.yml b/otter/generate/templates/r/environment.yml index 0949db280..5916f34c4 100644 --- a/otter/generate/templates/r/environment.yml +++ b/otter/generate/templates/r/environment.yml @@ -8,5 +8,6 @@ dependencies: - r-base - r-essentials - r-devtools + - libgit2 - pip: - -r file:requirements.txt diff --git a/otter/generate/templates/r/setup.sh b/otter/generate/templates/r/setup.sh index 1203ee2c2..caaeb0739 100644 --- a/otter/generate/templates/r/setup.sh +++ b/otter/generate/templates/r/setup.sh @@ -15,9 +15,14 @@ apt-get install -y /tmp/wkhtmltopdf.deb # update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 +# try to set up R apt-get clean +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 +add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran40/' + +add-apt-repository ppa:cran/libgit2 apt-get update -apt-get install -y build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libcurl4-openssl-dev libgit2-dev +apt-get install -y build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev libgit2-dev # install conda wget -nv -O {{ autograder_dir }}/source/miniconda_install.sh "{{ miniconda_install_url }}" From aad3b1c337cbf3acde46a69b06cf25404d49b7fa Mon Sep 17 00:00:00 2001 From: Chris Pyles Date: Thu, 21 Jan 2021 11:39:24 -0800 Subject: [PATCH 02/10] releas fe5d35a2ae7f7ffd5386878d2268625e8d734eaa --- Dockerfile | 2 +- otter/generate/templates/python/requirements.txt | 2 +- otter/generate/templates/r/requirements.txt | 2 +- test/test-assign/gs-autograder-correct/requirements.txt | 2 +- test/test-assign/rmd-autograder-correct/requirements.txt | 2 +- test/test-run/autograder/source/requirements.txt | 2 +- .../test-autograder/autograder-correct/requirements.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 792cadc6c..ab4beebf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,4 +59,4 @@ RUN mkdir /autograder ADD requirements.txt /tmp/requirements.txt RUN pip install -r /tmp/requirements.txt -RUN pip install otter-grader==2.0.5 +RUN pip install git+https://github.com/ucbds-infra/otter-grader.git@fe5d35a2ae7f7ffd5386878d2268625e8d734eaa diff --git a/otter/generate/templates/python/requirements.txt b/otter/generate/templates/python/requirements.txt index 4be728ddb..78ec0e870 100644 --- a/otter/generate/templates/python/requirements.txt +++ b/otter/generate/templates/python/requirements.txt @@ -13,6 +13,6 @@ nbformat dill jupytext numpy -otter-grader==2.0.5 +git+https://github.com/ucbds-infra/otter-grader.git@fe5d35a2ae7f7ffd5386878d2268625e8d734eaa {% endif %}{% if other_requirements %} {{ other_requirements }}{% endif %} \ No newline at end of file diff --git a/otter/generate/templates/r/requirements.txt b/otter/generate/templates/r/requirements.txt index 3a17f921f..5494dd706 100644 --- a/otter/generate/templates/r/requirements.txt +++ b/otter/generate/templates/r/requirements.txt @@ -14,4 +14,4 @@ dill rpy2 jupytext numpy -otter-grader==2.0.5 +git+https://github.com/ucbds-infra/otter-grader.git@fe5d35a2ae7f7ffd5386878d2268625e8d734eaa diff --git a/test/test-assign/gs-autograder-correct/requirements.txt b/test/test-assign/gs-autograder-correct/requirements.txt index 3bba508de..818d52f72 100644 --- a/test/test-assign/gs-autograder-correct/requirements.txt +++ b/test/test-assign/gs-autograder-correct/requirements.txt @@ -13,4 +13,4 @@ nbformat dill jupytext numpy -otter-grader==2.0.5 +git+https://github.com/ucbds-infra/otter-grader.git@fe5d35a2ae7f7ffd5386878d2268625e8d734eaa diff --git a/test/test-assign/rmd-autograder-correct/requirements.txt b/test/test-assign/rmd-autograder-correct/requirements.txt index d1ba950e6..6ed85b788 100644 --- a/test/test-assign/rmd-autograder-correct/requirements.txt +++ b/test/test-assign/rmd-autograder-correct/requirements.txt @@ -14,4 +14,4 @@ dill rpy2 jupytext numpy -otter-grader==2.0.5 \ No newline at end of file +git+https://github.com/ucbds-infra/otter-grader.git@fe5d35a2ae7f7ffd5386878d2268625e8d734eaa \ No newline at end of file diff --git a/test/test-run/autograder/source/requirements.txt b/test/test-run/autograder/source/requirements.txt index 47089a09f..f4986d308 100644 --- a/test/test-run/autograder/source/requirements.txt +++ b/test/test-run/autograder/source/requirements.txt @@ -13,6 +13,6 @@ nbformat dill jupytext numpy -otter-grader==2.0.5 +git+https://github.com/ucbds-infra/otter-grader.git@fe5d35a2ae7f7ffd5386878d2268625e8d734eaa tqdm diff --git a/test/test_generate/test-autograder/autograder-correct/requirements.txt b/test/test_generate/test-autograder/autograder-correct/requirements.txt index 47089a09f..f4986d308 100644 --- a/test/test_generate/test-autograder/autograder-correct/requirements.txt +++ b/test/test_generate/test-autograder/autograder-correct/requirements.txt @@ -13,6 +13,6 @@ nbformat dill jupytext numpy -otter-grader==2.0.5 +git+https://github.com/ucbds-infra/otter-grader.git@fe5d35a2ae7f7ffd5386878d2268625e8d734eaa tqdm From 40fa5a5c4c7bc0b5e34fee2b1782c6d3156c8689 Mon Sep 17 00:00:00 2001 From: Chris Pyles Date: Thu, 21 Jan 2021 13:34:08 -0800 Subject: [PATCH 03/10] updated tutorial --- .../notebooks/assign-code-question.html | 25814 ++++++++-------- docs/_static/notebooks/assign-plugin.html | 25711 ++++++++------- docs/_static/tutorial.zip | Bin 464286 -> 471188 bytes docs/tutorial/assign/assign-demo.ipynb | 5 +- 4 files changed, 24579 insertions(+), 26951 deletions(-) diff --git a/docs/_static/notebooks/assign-code-question.html b/docs/_static/notebooks/assign-code-question.html index d984b90d4..2c44f5d9d 100644 --- a/docs/_static/notebooks/assign-code-question.html +++ b/docs/_static/notebooks/assign-code-question.html @@ -1,14259 +1,13082 @@ - -assign-code-question +assign-code-question + + - - - - - - - - + -/* Input area styling */ -.jp-InputArea { - overflow: hidden; -} -.jp-InputArea-editor { - overflow: hidden; + + + - + - + - + +
+
-