Merge branch 'master' of https://github.com/ucbds-infra/otter-grader

ucbds-infra · Jan 24, 2025 · 733bf06 · 733bf06
2 parents e474447 + 68d43dc
commit 733bf06
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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 <[email protected]>"]
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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