From 68d43dc2c8c8a83c4ff278a31e0f8ff454be791e Mon Sep 17 00:00:00 2001 From: Chris Pyles <40970945+chrispyles@users.noreply.github.com> Date: Fri, 24 Jan 2025 08:17:45 -0800 Subject: [PATCH] Merge v6.0.5 updates into master (#910) * release v6.0.4 * Added `liblzma-devel`, `zlib-devel-amzn2-aarch64`, and `zlib` to R grading environment (#908) * Added , , and to R grading environment * add new deps to conda env * Update CHANGELOG.md * release v6.0.5 (#909) Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 4 ++++ CITATION.cff | 4 ++-- docs/_static/grading-environment-r.yml | 5 ++++- docs/_static/grading-environment.yml | 2 +- docs/_static/tutorial.zip | Bin 461171 -> 461171 bytes environment.yml | 3 +++ otter/generate/__init__.py | 3 +++ otter/version.py | 2 +- pyproject.toml | 2 +- .../environment.yml | 2 +- .../gs-autograder-correct/environment.yml | 2 +- .../rmd-autograder-correct/environment.yml | 5 ++++- .../files/autograder-correct/environment.yml | 2 +- .../autograder-custom-env/environment.yml | 2 +- .../autograder-r-correct/environment.yml | 5 ++++- .../environment.yml | 5 ++++- .../autograder-token-correct/environment.yml | 2 +- .../files/autograder/source/environment.yml | 2 +- 18 files changed, 37 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d85eefb..ecd06d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ * Update Otter Assign to handle notebooks with an invalid kernelspec by assuming the language is Python per [#895](https://github.com/ucbds-infra/otter-grader/issues/895) +**v6.0.5:** + +* Added `liblzma-devel`, `zlib-devel-amzn2-aarch64`, and `zlib` to R grading environment + **v6.0.4:** * Added `jupyter_server` to grading environment to allow for installation of `nb_conda_kernels` diff --git a/CITATION.cff b/CITATION.cff index e741c9ed..823ab775 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,10 +8,10 @@ authors: - name: UC Berkeley Data Science Education Program cff-version: "1.1.0" -date-released: 2024-11-07 +date-released: 2025-01-24 license: "BSD-3-Clause" message: "If you use this software, please cite it as below." repository-code: "https://github.com/ucbds-infra/otter-grader" title: "Otter-Grader: A Python and R autograding solution" -version: "6.0.4" +version: "6.0.5" doi: 10.5281/zenodo.5259955 diff --git a/docs/_static/grading-environment-r.yml b/docs/_static/grading-environment-r.yml index c34c0cd1..2e3793ac 100644 --- a/docs/_static/grading-environment-r.yml +++ b/docs/_static/grading-environment-r.yml @@ -11,6 +11,9 @@ dependencies: - gxx_linux-64 - libgit2 - libgomp + - liblzma-devel + - zlib-devel-amzn2-aarch64 + - zlib - r-base>=4.0.0 - r-devtools - r-essentials @@ -22,4 +25,4 @@ dependencies: - r-usethis - r-ottr==1.5.0 - pip: - - otter-grader[grading,plugins,r]==6.0.4 + - otter-grader[grading,plugins,r]==6.0.5 diff --git a/docs/_static/grading-environment.yml b/docs/_static/grading-environment.yml index c203e4f1..0ea2a9f6 100644 --- a/docs/_static/grading-environment.yml +++ b/docs/_static/grading-environment.yml @@ -7,4 +7,4 @@ dependencies: - pip - nb_conda_kernels - pip: - - otter-grader[grading,plugins]==6.0.4 + - otter-grader[grading,plugins]==6.0.5 diff --git a/docs/_static/tutorial.zip b/docs/_static/tutorial.zip index dcfe16e244a49212254810a5c6dfabf100a0ed9b..33e2b7cb00cf1841dc1215ac56f93f9d5c93195e 100644 GIT binary patch delta 1826 zcmex7N#^q;8NL8-W)?065V+J}5jBxdQMG&5ZD2E%VF5X1`pIB6 zdl9UPWJ1`O~&h*5a%u?IG z++uS757sbozA097H@*lw4OTGO_6&9vo7>K;+X1oEqLtACucd2lGD)>BZDriPw3X?0 z2t5@KdK6T7N54&Rp)rsM{A zGcw6BBO+k>aVBOs*+Yp2w5Q&_DK?Q0E zBhaWNjguJ|rVDVeYY}70(~|R-zsWK%@Xupl&_XdqQWk8A{Pgd^Yy+~`*2^rY%u5OlAx^hIzx?l2$_xyx;plGJ>JKq-dO#5yKe29!9JpJBSgG&Zeze7-@X26zku8G8h@3Uuh6Nbub~!8)*NIOrU||;`N|PWf yP*c}I*6Dhz>}t4mAf@x;9PGNd6(R+RI48TYCRT^DvVl^FAP_DCvbHm^19<=u2G-gD delta 1749 zcmex7N#^q;8NL8-W)?065J*x;kDSP-sQTSnC!N(sC%v?Sn}Lz#B{Ks9OFd8;RpI3I zE7gcoIeqhUCQ}iRp&*QG==ML)nF3Fb)Ophn z9AK4d-8cq|GtUn5a&6=z(YmZ$?l`OLy zA1Dk3`sIJGQf6Ri4WDc%t33IGzYul}VgcKgA!e@bx52LDcmFC$E`<9gF2wG4j|U;?s3F*oBA+kOOS&Qp{zym_XWOrvGGP7a&SoA_q{L;Vov6HreU3 zIoLUgarmO0OK;4xWn=(hH57;IF|vY;(jmqaSipg3VYn#*3~wEE?Aa!65YfONm52mA z-G>F}i%NU8$rG&A)$qk4lAb%vKs~#IffmV6mtbKR#O-2)CPbcOV9a_p!0F>t+^I<|PsB_zA$I%&a^O=n%>2$5`1#h;hi3Iggw)WEdDa!WbA-P#mJZ z0ceoAGjW07b?4H-8fgZG*WT#HtUbdv`9U$!fq9&RU6-izCeF!jtcf*iu(E;Dfglhr L1G2U=u>*MkKI)?) diff --git a/environment.yml b/environment.yml index 847bbe38..454435ed 100644 --- a/environment.yml +++ b/environment.yml @@ -4,6 +4,9 @@ channels: - defaults dependencies: - python>=3.9 + - liblzma-devel + - zlib-devel-amzn2-aarch64 + - zlib - r-base>=4.0.0 - r-essentials - r-devtools diff --git a/otter/generate/__init__.py b/otter/generate/__init__.py index 493d7cfe..2e6d5cb8 100644 --- a/otter/generate/__init__.py +++ b/otter/generate/__init__.py @@ -66,6 +66,9 @@ def to_dict(self): "gxx_linux-64", "libgit2", "libgomp", + "liblzma-devel", + "zlib-devel-amzn2-aarch64", + "zlib", "r-base>=4.0.0", "r-devtools", "r-essentials", diff --git a/otter/version.py b/otter/version.py index cdc12856..85ae6cb3 100644 --- a/otter/version.py +++ b/otter/version.py @@ -6,7 +6,7 @@ from textwrap import dedent, indent -__version__ = "6.0.4" +__version__ = "6.0.5" LOGO_WITH_VERSION = rf""" diff --git a/pyproject.toml b/pyproject.toml index 53de7eac..50418b98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "otter-grader" -version = "6.0.4" +version = "6.0.5" description = "A Python and R autograding solution" authors = ["Christopher Pyles "] license = "BSD-3-Clause" diff --git a/test/test_assign/files/example-autograder-correct/environment.yml b/test/test_assign/files/example-autograder-correct/environment.yml index 75a6234a..2acb6e77 100644 --- a/test/test_assign/files/example-autograder-correct/environment.yml +++ b/test/test_assign/files/example-autograder-correct/environment.yml @@ -7,4 +7,4 @@ dependencies: - nb_conda_kernels - jupyter_server - pip: - - otter-grader[grading,plugins]==6.0.4 + - otter-grader[grading,plugins]==6.0.5 diff --git a/test/test_assign/files/gs-autograder-correct/environment.yml b/test/test_assign/files/gs-autograder-correct/environment.yml index c297548d..eb8abbb1 100644 --- a/test/test_assign/files/gs-autograder-correct/environment.yml +++ b/test/test_assign/files/gs-autograder-correct/environment.yml @@ -8,4 +8,4 @@ dependencies: - nb_conda_kernels - jupyter_server - pip: - - otter-grader[grading,plugins]==6.0.4 + - otter-grader[grading,plugins]==6.0.5 diff --git a/test/test_assign/files/rmd-autograder-correct/environment.yml b/test/test_assign/files/rmd-autograder-correct/environment.yml index 4789bfec..7c8f6b90 100644 --- a/test/test_assign/files/rmd-autograder-correct/environment.yml +++ b/test/test_assign/files/rmd-autograder-correct/environment.yml @@ -12,6 +12,9 @@ dependencies: - gxx_linux-64 - libgit2 - libgomp + - liblzma-devel + - zlib-devel-amzn2-aarch64 + - zlib - r-base>=4.0.0 - r-devtools - r-essentials @@ -23,4 +26,4 @@ dependencies: - r-usethis - r-ottr==1.5.0 - pip: - - otter-grader[grading,plugins,r]==6.0.4 + - otter-grader[grading,plugins,r]==6.0.5 diff --git a/test/test_generate/files/autograder-correct/environment.yml b/test/test_generate/files/autograder-correct/environment.yml index 5cafcbc2..05e939dd 100644 --- a/test/test_generate/files/autograder-correct/environment.yml +++ b/test/test_generate/files/autograder-correct/environment.yml @@ -8,5 +8,5 @@ dependencies: - nb_conda_kernels - jupyter_server - pip: - - otter-grader[grading,plugins]==6.0.4 + - otter-grader[grading,plugins]==6.0.5 - tqdm diff --git a/test/test_generate/files/autograder-custom-env/environment.yml b/test/test_generate/files/autograder-custom-env/environment.yml index 2a17c040..bca2db11 100644 --- a/test/test_generate/files/autograder-custom-env/environment.yml +++ b/test/test_generate/files/autograder-custom-env/environment.yml @@ -9,5 +9,5 @@ dependencies: - jupyter_server - pip: - statsmodels - - otter-grader[grading,plugins]==6.0.4 + - otter-grader[grading,plugins]==6.0.5 - tqdm diff --git a/test/test_generate/files/autograder-r-correct/environment.yml b/test/test_generate/files/autograder-r-correct/environment.yml index 4789bfec..7c8f6b90 100644 --- a/test/test_generate/files/autograder-r-correct/environment.yml +++ b/test/test_generate/files/autograder-r-correct/environment.yml @@ -12,6 +12,9 @@ dependencies: - gxx_linux-64 - libgit2 - libgomp + - liblzma-devel + - zlib-devel-amzn2-aarch64 + - zlib - r-base>=4.0.0 - r-devtools - r-essentials @@ -23,4 +26,4 @@ dependencies: - r-usethis - r-ottr==1.5.0 - pip: - - otter-grader[grading,plugins,r]==6.0.4 + - otter-grader[grading,plugins,r]==6.0.5 diff --git a/test/test_generate/files/autograder-r-requirements-correct/environment.yml b/test/test_generate/files/autograder-r-requirements-correct/environment.yml index 4789bfec..7c8f6b90 100644 --- a/test/test_generate/files/autograder-r-requirements-correct/environment.yml +++ b/test/test_generate/files/autograder-r-requirements-correct/environment.yml @@ -12,6 +12,9 @@ dependencies: - gxx_linux-64 - libgit2 - libgomp + - liblzma-devel + - zlib-devel-amzn2-aarch64 + - zlib - r-base>=4.0.0 - r-devtools - r-essentials @@ -23,4 +26,4 @@ dependencies: - r-usethis - r-ottr==1.5.0 - pip: - - otter-grader[grading,plugins,r]==6.0.4 + - otter-grader[grading,plugins,r]==6.0.5 diff --git a/test/test_generate/files/autograder-token-correct/environment.yml b/test/test_generate/files/autograder-token-correct/environment.yml index 5cafcbc2..05e939dd 100644 --- a/test/test_generate/files/autograder-token-correct/environment.yml +++ b/test/test_generate/files/autograder-token-correct/environment.yml @@ -8,5 +8,5 @@ dependencies: - nb_conda_kernels - jupyter_server - pip: - - otter-grader[grading,plugins]==6.0.4 + - otter-grader[grading,plugins]==6.0.5 - tqdm diff --git a/test/test_run/files/autograder/source/environment.yml b/test/test_run/files/autograder/source/environment.yml index 5cafcbc2..05e939dd 100644 --- a/test/test_run/files/autograder/source/environment.yml +++ b/test/test_run/files/autograder/source/environment.yml @@ -8,5 +8,5 @@ dependencies: - nb_conda_kernels - jupyter_server - pip: - - otter-grader[grading,plugins]==6.0.4 + - otter-grader[grading,plugins]==6.0.5 - tqdm