diff --git a/portal/portal/__init__.py b/portal/portal/__init__.py index 3fff62c9..8b137891 100644 --- a/portal/portal/__init__.py +++ b/portal/portal/__init__.py @@ -1,7 +1 @@ -__version__ = "0.1.0" -__version_info__ = tuple( - [ - int(num) if num.isdigit() else num - for num in __version__.replace("-", ".", 1).split(".") - ], -) + diff --git a/portal/portal/academy/views.py b/portal/portal/academy/views.py index 431e9dd4..81589ed5 100644 --- a/portal/portal/academy/views.py +++ b/portal/portal/academy/views.py @@ -140,7 +140,8 @@ class StudentUnitDetailView(StudentViewsMixin, BaseUnitDetailView): class InstructorUserListView(InstructorViewsMixin, ListView): model = get_user_model() - queryset = get_user_model().objects.filter(is_student=True, failed_or_dropped=False) + queryset = model.objects.filter(is_student=True, failed_or_dropped=False) + template_name = "academy/instructor/user_list.html" def get_queryset(self): diff --git a/portal/portal/grading/services.py b/portal/portal/grading/services.py index dccfb83f..6503fdd2 100644 --- a/portal/portal/grading/services.py +++ b/portal/portal/grading/services.py @@ -79,7 +79,8 @@ def get_command(self, image, name, env): "run", name, "--restart=Never", - # "--requests='cpu=100m,memory=512Mi'", + "--requests='cpu=250m,memory=512Mi'", + "--limits='cpu=1,memory=1Gi'", "--rm", "-i", # "--tty", f"--image={image}", diff --git a/portal/portal/templates/academy/instructor/user_list.html b/portal/portal/templates/academy/instructor/user_list.html index 02fd0634..600b09a5 100644 --- a/portal/portal/templates/academy/instructor/user_list.html +++ b/portal/portal/templates/academy/instructor/user_list.html @@ -18,7 +18,6 @@

Name - Slack Submission Date Total Eligible for graduation @@ -37,8 +36,7 @@

{{ obj.user.username }} - {{ obj.user.slack_member_id }} + {{ obj.user.first_name }} {{ obj.user.last_name }} {{ obj.submission_date }} {{ obj.total_score }}/{{ max_score }} {% if obj.user.can_graduate %}Yes{% else %}No{% endif %}