Merge pull request #93 from arbisoft/revert-81-litmustest.staging

Revert "Litmustest.staging"

.gitignore

@@ -73,5 +73,3 @@ test/selenium/screenshots/*
 logs/*.log*
 
 edx-ora2/
-
-openassessment/xblock/job_sample_grader/secret_data

Makefile

@@ -101,20 +101,3 @@ test-sandbox: test-acceptance test-a11y
 install-osx-requirements:
 	brew install gettext
 	brew link gettext --force
-
-upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
-upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	pip install -qr requirements/pip-tools.txt
-	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
-	pip-compile --upgrade -o requirements/base.txt requirements/base.in
-	pip-compile --upgrade -o requirements/test.txt requirements/test.in
-	pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
-	# Delete django pin from test requirements to avoid tox version collision
-	sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
-	sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
-	# Delete extra metadata that causes build to fail
-	sed -i.tmp '/^--index-url/d' requirements/*.txt
-	sed -i.tmp '/^--extra-index-url/d' requirements/*.txt
-	sed -i.tmp '/^--trusted-host/d' requirements/*.txt
-	# Delete temporary files
-	rm requirements/*.txt.tmp

openassessment/assessment/admin.py

@@ -6,7 +6,7 @@
 import json
 
 from django.contrib import admin
-from django.urls import reverse_lazy
+from django.core.urlresolvers import reverse_lazy
 from django.utils import html
 
 from openassessment.assessment.models import Assessment, AssessmentFeedback, PeerWorkflow, PeerWorkflowItem, Rubric

openassessment/assessment/migrations/0001_initial.py

@@ -47,7 +47,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('feedback', models.TextField(default=b'', blank=True)),
-                ('assessment', models.ForeignKey(related_name='parts', to='assessment.Assessment', on_delete=models.CASCADE)),
+                ('assessment', models.ForeignKey(related_name='parts', to='assessment.Assessment')),
             ],
         ),
         migrations.CreateModel(
@@ -72,7 +72,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=100)),
                 ('label', models.CharField(max_length=100, blank=True)),
                 ('explanation', models.TextField(max_length=10000, blank=True)),
-                ('criterion', models.ForeignKey(related_name='options', to='assessment.Criterion', on_delete=models.CASCADE)),
+                ('criterion', models.ForeignKey(related_name='options', to='assessment.Criterion')),
             ],
             options={
                 'ordering': ['criterion', 'order_num'],
@@ -102,9 +102,9 @@ class Migration(migrations.Migration):
                 ('submission_uuid', models.CharField(max_length=128, db_index=True)),
                 ('started_at', models.DateTimeField(default=django.utils.timezone.now, db_index=True)),
                 ('scored', models.BooleanField(default=False)),
-                ('assessment', models.ForeignKey(to='assessment.Assessment', null=True, on_delete=models.CASCADE)),
-                ('author', models.ForeignKey(related_name='graded_by', to='assessment.PeerWorkflow', on_delete=models.CASCADE)),
-                ('scorer', models.ForeignKey(related_name='graded', to='assessment.PeerWorkflow', on_delete=models.CASCADE)),
+                ('assessment', models.ForeignKey(to='assessment.Assessment', null=True)),
+                ('author', models.ForeignKey(related_name='graded_by', to='assessment.PeerWorkflow')),
+                ('scorer', models.ForeignKey(related_name='graded', to='assessment.PeerWorkflow')),
             ],
             options={
                 'ordering': ['started_at', 'id'],
@@ -147,33 +147,33 @@ class Migration(migrations.Migration):
                 ('raw_answer', models.TextField(blank=True)),
                 ('content_hash', models.CharField(unique=True, max_length=40, db_index=True)),
                 ('options_selected', models.ManyToManyField(to='assessment.CriterionOption')),
-                ('rubric', models.ForeignKey(to='assessment.Rubric', on_delete=models.CASCADE)),
+                ('rubric', models.ForeignKey(to='assessment.Rubric')),
             ],
         ),
         migrations.AddField(
             model_name='studenttrainingworkflowitem',
             name='training_example',
-            field=models.ForeignKey(to='assessment.TrainingExample', on_delete=models.CASCADE),
+            field=models.ForeignKey(to='assessment.TrainingExample'),
         ),
         migrations.AddField(
             model_name='studenttrainingworkflowitem',
             name='workflow',
-            field=models.ForeignKey(related_name='items', to='assessment.StudentTrainingWorkflow', on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='items', to='assessment.StudentTrainingWorkflow'),
         ),
         migrations.AddField(
             model_name='criterion',
             name='rubric',
-            field=models.ForeignKey(related_name='criteria', to='assessment.Rubric', on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='criteria', to='assessment.Rubric'),
         ),
         migrations.AddField(
             model_name='assessmentpart',
             name='criterion',
-            field=models.ForeignKey(related_name='+', to='assessment.Criterion', on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='+', to='assessment.Criterion'),
         ),
         migrations.AddField(
             model_name='assessmentpart',
             name='option',
-            field=models.ForeignKey(related_name='+', to='assessment.CriterionOption', null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='+', to='assessment.CriterionOption', null=True),
         ),
         migrations.AddField(
             model_name='assessmentfeedback',
@@ -183,7 +183,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='assessment',
             name='rubric',
-            field=models.ForeignKey(to='assessment.Rubric', on_delete=models.CASCADE),
+            field=models.ForeignKey(to='assessment.Rubric'),
         ),
         migrations.AlterUniqueTogether(
             name='studenttrainingworkflowitem',

openassessment/assessment/models/base.py

@@ -109,7 +109,7 @@ def content_hash_from_dict(rubric_dict):
         rubric_dict.pop("content_hash", None)
 
         canonical_form = json.dumps(rubric_dict, sort_keys=True)
-        return sha1(canonical_form.encode('utf-8')).hexdigest()
+        return sha1(canonical_form).hexdigest()
 
     @staticmethod
     def structure_hash_from_dict(rubric_dict):
@@ -141,7 +141,7 @@ def structure_hash_from_dict(rubric_dict):
             for criterion in rubric_dict.get('criteria', [])
         ]
         canonical_form = json.dumps(structure, sort_keys=True)
-        return sha1(canonical_form.encode('utf-8')).hexdigest()
+        return sha1(canonical_form).hexdigest()
 
 
 class Criterion(models.Model):
@@ -152,7 +152,7 @@ class Criterion(models.Model):
 
     All Rubrics have at least one Criterion.
     """
-    rubric = models.ForeignKey(Rubric, related_name="criteria", on_delete=models.CASCADE)
+    rubric = models.ForeignKey(Rubric, related_name="criteria")
 
     # Backwards compatibility: The "name" field was formerly
     # used both as a display name and as a unique identifier.
@@ -192,7 +192,7 @@ class CriterionOption(models.Model):
     Assessment. That state is stored in :class:`AssessmentPart`.
     """
     # All Criteria must have at least one CriterionOption.
-    criterion = models.ForeignKey(Criterion, related_name="options", on_delete=models.CASCADE)
+    criterion = models.ForeignKey(Criterion, related_name="options")
 
     # 0-based order in Criterion
     order_num = models.PositiveIntegerField()
@@ -417,7 +417,7 @@ class Assessment(models.Model):
     MAX_FEEDBACK_SIZE = 1024 * 100
 
     submission_uuid = models.CharField(max_length=128, db_index=True)
-    rubric = models.ForeignKey(Rubric, on_delete=models.CASCADE)
+    rubric = models.ForeignKey(Rubric)
 
     scored_at = models.DateTimeField(default=now, db_index=True)
     scorer_id = models.CharField(max_length=40, db_index=True)
@@ -613,16 +613,16 @@ class AssessmentPart(models.Model):
     """
     MAX_FEEDBACK_SIZE = 1024 * 100
 
-    assessment = models.ForeignKey(Assessment, related_name='parts', on_delete=models.CASCADE)
+    assessment = models.ForeignKey(Assessment, related_name='parts')
 
     # Assessment parts are usually associated with an option
     # (representing the point value selected for a particular criterion)
     # It's possible, however, for an assessment part to contain
     # only written feedback, with no point value.
     # In this case, the assessment part is associated with a criterion,
     # but not with any option (the `option` field is set to null).
-    criterion = models.ForeignKey(Criterion, related_name="+", on_delete=models.CASCADE)
-    option = models.ForeignKey(CriterionOption, null=True, related_name="+", on_delete=models.CASCADE)
+    criterion = models.ForeignKey(Criterion, related_name="+")
+    option = models.ForeignKey(CriterionOption, null=True, related_name="+")
 
     # Free-form text feedback for the specific criterion
     # Note that the `Assessment` model also has a feedback field,

openassessment/assessment/models/peer.py

@@ -440,11 +440,11 @@ class PeerWorkflowItem(models.Model):
     assessment represents the completed assessment for this work item.
 
     """
-    scorer = models.ForeignKey(PeerWorkflow, related_name='graded', on_delete=models.CASCADE)
-    author = models.ForeignKey(PeerWorkflow, related_name='graded_by', on_delete=models.CASCADE)
+    scorer = models.ForeignKey(PeerWorkflow, related_name='graded')
+    author = models.ForeignKey(PeerWorkflow, related_name='graded_by')
     submission_uuid = models.CharField(max_length=128, db_index=True)
     started_at = models.DateTimeField(default=now, db_index=True)
-    assessment = models.ForeignKey(Assessment, null=True, on_delete=models.CASCADE)
+    assessment = models.ForeignKey(Assessment, null=True)
 
     # This WorkflowItem was used to determine the final score for the Workflow.
     scored = models.BooleanField(default=False)

openassessment/assessment/models/student_training.py

@@ -187,11 +187,11 @@ class StudentTrainingWorkflowItem(models.Model):
     if there are no examples left, the student has
     successfully completed training.
     """
-    workflow = models.ForeignKey(StudentTrainingWorkflow, related_name="items", on_delete=models.CASCADE)
+    workflow = models.ForeignKey(StudentTrainingWorkflow, related_name="items")
     order_num = models.PositiveIntegerField()
     started_at = models.DateTimeField(auto_now_add=True)
     completed_at = models.DateTimeField(default=None, null=True)
-    training_example = models.ForeignKey(TrainingExample, on_delete=models.CASCADE)
+    training_example = models.ForeignKey(TrainingExample)
 
     class Meta:
         app_label = "assessment"

openassessment/assessment/models/training.py

@@ -21,7 +21,7 @@ class TrainingExample(models.Model):
     # The answer (JSON-serialized)
     raw_answer = models.TextField(blank=True)
 
-    rubric = models.ForeignKey(Rubric, on_delete=models.CASCADE)
+    rubric = models.ForeignKey(Rubric)
 
     # Use a m2m to avoid changing the criterion option
     options_selected = models.ManyToManyField(CriterionOption)
@@ -137,7 +137,7 @@ def calculate_hash(answer, options_selected, rubric):
             'options_selected': options_selected,
             'rubric': rubric.id
         })
-        return sha1(contents.encode('utf-8')).hexdigest()
+        return sha1(contents).hexdigest()
 
     @classmethod
     def cache_key(cls, answer, options_selected, rubric):

openassessment/fileupload/backends/django_storage.py

@@ -4,7 +4,7 @@
 
 from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
-from django.urls import reverse
+from django.core.urlresolvers import reverse
 
 from .base import BaseBackend
 

openassessment/fileupload/backends/filesystem.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 import django.core.cache
-from django.urls import reverse
+from django.core.urlresolvers import reverse
 from django.utils.encoding import smart_text
 
 from .. import exceptions

openassessment/fileupload/tests/test_api.py

@@ -16,7 +16,7 @@
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.urls import reverse_lazy
+from django.core.urlresolvers import reverse_lazy
 from django.test import TestCase
 from django.test.utils import override_settings
 

openassessment/templates/openassessmentblock/edit/oa_edit.html

@@ -43,73 +43,6 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
                     </div>
                     <p class="setting-help">{% trans "The display name for this component." %}</p>
                 </li>
-                <li class="openassessment_date_editor field comp-setting-entry">
-                    <div class="wrapper-comp-setting">
-                        <label
-                            for="openassessment_labels_editor"
-                            class="setting-label">
-                            {% trans "Labels" %}
-                        </label>
-                        <input
-                            type="text"
-                            class="input setting-input"
-                            id="openassessment_labels_editor"
-                            value="{{ labels }}"
-                        >
-                    </div>
-                    <p class="setting-help">
-                        {% trans "A comma-separated list of label strings that can be used to categorize a problem. For example, oop, problem solving, dsa, etc." %}
-                        <br /> {% trans "Rules:" %}
-                        <br /> - {% trans "Only lower case alphabets [a-z]." %}
-                        <br /> - {% trans "Special character &lt;space&gt; is allowed." %}
-                        <br /> - {% trans "Use \",\" to separate labels." %}
-                    </p>
-                </li>
-                <li class="field comp-setting-entry">
-                    <div class="wrapper-comp-setting">
-                        <label for="openassessment_show_private_test_case_results_editor" class="setting-label">
-                            {% trans "Show Private Test Case Results"%}
-                        </label>
-                        <select id="openassessment_show_private_test_case_results_editor" class="input setting-input">
-                            <option value="0">{% trans "False"%}</option>
-                            <option value="1" {% if show_private_test_case_results %} selected="true" {% endif %}>
-                                {% trans "True"%}
-                            </option>
-                        </select>
-                    </div>
-                    <p class="setting-help">
-                        {% trans "Indicates whether or not to show private test case results. This only shows if the case passed or failed, it does not show any values."%}
-                    </p>
-                </li>
-                <li id="openassessment_executor_wrapper" class="field comp-setting-entry">
-                    <div class="wrapper-comp-setting">
-                        <label for="openassessment_executor" class="setting-label">{% trans "Code Executor"%}</label>
-                        <select id="openassessment_executor" class="input setting-input" name="executor">
-                            {% for option_key, option_name in code_executor_options.items %}
-                            <option value="{{ option_key }}" {% if option_key == executor %} selected="true" {% endif %}>{{ option_name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <p class="setting-help">
-                        {% trans "Choose which code executor to use for this question." %}
-                    </p>
-                </li>
-                <li class="field comp-setting-entry">
-                    <div class="wrapper-comp-setting">
-                        <label for="openassessment_show_file_read_code_editor" class="setting-label">
-                            {% trans "Show File Read Code"%}
-                        </label>
-                        <select id="openassessment_show_file_read_code_editor" class="input setting-input">
-                            <option value="0">{% trans "False"%}</option>
-                            <option value="1" {% if show_file_read_code %} selected="true" {% endif %}>
-                                {% trans "True"%}
-                            </option>
-                        </select>
-                    </div>
-                    <p class="setting-help">
-                        {% trans "Indicates whether or not to show file read code."%}
-                    </p>
-                </li>
                 <li class="openassessment_date_editor field comp-setting-entry">
                     <div class="wrapper-comp-setting">
                         <label