Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #185 #186

Merged
merged 3 commits into from
Jan 17, 2021
Merged

Fix #185 #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b14041
fixed #185
chrispyles Jan 17, 2021
a811973
changelog
chrispyles Jan 17, 2021
d8c81bf
release v2.0.2
chrispyles Jan 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
RUN pip install otter-grader==2.0.2
4 changes: 4 additions & 0 deletions docs/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

**v2.0.2:**

* Fixed [#185](https://github.com/ucbds-infra/otter-grader/issues/185)

**v2.0.1:**

* Added the `each` key to `points` in question metadata for Otter Assign
Expand Down
5 changes: 4 additions & 1 deletion otter/assign/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,10 @@ def run_generate_autograder(result, assignment, gs_username, gs_password):
generate_args['lang'] = 'r'

if assignment.requirements:
requirements = 'requirements.txt'
if assignment.is_r:
requirements = 'requirements.R'
else:
requirements = 'requirements.txt'
generate_cmd += ["-r", str(requirements)]
if assignment.overwrite_requirements:
generate_cmd += ["--overwrite-requirements"]
Expand Down
2 changes: 1 addition & 1 deletion otter/generate/templates/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ nbformat
dill
jupytext
numpy
otter-grader==2.0.1
otter-grader==2.0.2
{% endif %}{% if other_requirements %}
{{ other_requirements }}{% endif %}
2 changes: 1 addition & 1 deletion otter/generate/templates/r/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ dill
rpy2
jupytext
numpy
otter-grader==2.0.1
otter-grader==2.0.2
2 changes: 1 addition & 1 deletion otter/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from textwrap import dedent

__version__ = "2.0.1"
__version__ = "2.0.2"

LOGO_WITH_VERSION = f"""\
_________ __ __
Expand Down
2 changes: 1 addition & 1 deletion test/test-assign/gs-autograder-correct/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ nbformat
dill
jupytext
numpy
otter-grader==2.0.1
otter-grader==2.0.2
2 changes: 1 addition & 1 deletion test/test-assign/rmd-autograder-correct/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ dill
rpy2
jupytext
numpy
otter-grader==2.0.1
otter-grader==2.0.2
2 changes: 1 addition & 1 deletion test/test-run/autograder/source/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ nbformat
dill
jupytext
numpy
otter-grader==2.0.1
otter-grader==2.0.2

tqdm
2 changes: 1 addition & 1 deletion test/test_generate/test-autograder/autograder-correct/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ nbformat
dill
jupytext
numpy
otter-grader==2.0.1
otter-grader==2.0.2

tqdm