2.0.0 fixup

Deprecates Workflow.uuid, to prevent the issues seen in edx-submissions
(EDUCATOR-1090). Also fixes acceptance tests, and resets the
edx-submissions version to the latest.

openassessment/workflow/admin.py

@@ -16,10 +16,10 @@ class AssessmentWorkflowAdmin(admin.ModelAdmin):
     there is no expectation of immutability for `AssessmentWorkflow`.
     """
     list_display = (
-        'uuid', 'status', 'submission_uuid', 'course_id', 'item_id', 'status_changed'
+        'status', 'submission_uuid', 'course_id', 'item_id', 'status_changed'
     )
     list_filter = ('status',)
-    search_fields = ('uuid', 'submission_uuid', 'course_id', 'item_id')
+    search_fields = ('submission_uuid', 'course_id', 'item_id')
     inlines = (AssessmentWorkflowStepInline,)
 
 admin.site.register(AssessmentWorkflow, AssessmentWorkflowAdmin)

openassessment/workflow/serializers.py

@@ -13,7 +13,6 @@ class AssessmentWorkflowSerializer(serializers.ModelSerializer):
     class Meta:
         model = AssessmentWorkflow
         fields = (
-            'uuid',
             'submission_uuid',
             'status',
             'created',

openassessment/workflow/test/test_api.py

@@ -58,7 +58,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
         self.assertEqual(
             workflow_keys,
             {
-                'submission_uuid', 'uuid', 'status', 'created', 'modified', 'score'
+                'submission_uuid', 'status', 'created', 'modified', 'score'
             }
         )
         self.assertEqual(workflow["submission_uuid"], submission["uuid"])
@@ -150,7 +150,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
         self.assertEqual(
             workflow_keys,
             {
-                'submission_uuid', 'uuid', 'status', 'created', 'modified', 'score'
+                'submission_uuid', 'status', 'created', 'modified', 'score'
             }
         )
         self.assertEqual(workflow["submission_uuid"], submission["uuid"])
@@ -510,7 +510,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
         }, answer)
 
         workflow = workflow_api.create_workflow(submission['uuid'], steps)
-        workflow_model = AssessmentWorkflow.objects.get(uuid=workflow['uuid'])
+        workflow_model = AssessmentWorkflow.objects.get(submission_uuid=workflow['submission_uuid'])
         workflow_model.status = status
         workflow_model.save()
         return workflow, submission

openassessment/xblock/grade_mixin.py

@@ -374,7 +374,7 @@ class GradeMixin(object):
         if len(assessments) > 0:
             first_assessment = assessments[0]
             option = first_assessment['option']
-            if option and option.get('points'):
+            if option and option.get('points', None) != None:
                 first_assessment['points'] = option['points']
 
         return assessments

requirements/base.txt

 # edX Internal Requirements
-edx-submissions>=2.0.7,<3.0.0
+edx-submissions>=2.0.11,<3.0.0
 git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3
 git+https://github.com/edx/XBlock.git@xblock-1.0.1#egg=XBlock==1.0.1
 git+https://github.com/edx/xblock-sdk.git@v0.1.4#egg=xblock-sdk==0.1.4

setup.py

@@ -34,7 +34,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='ora2',
-    version='2.0.0',
+    version='2.0.1',
     author='edX',
     url='http://github.com/edx/edx-ora2',
     description='edx-ora2',

test/acceptance/tests.py

@@ -643,8 +643,8 @@ class StaffAreaTest(OpenAssessmentTest):
             self.staff_area_page.learner_final_score_table_headers
         )
         self.assertEquals(
-            ['Poor - 0 points', 'Fair',
-             'Fair - 1 point', 'Good'],
+            [u'Poor - 0 points', u'Fair',
+             u'Fair - 1 point', u'Good'],
             self.staff_area_page.learner_final_score_table_values
         )
 
@@ -1067,8 +1067,8 @@ class FullWorkflowOverrideTest(OpenAssessmentTest, FullWorkflowMixin):
             self.staff_area_page.learner_final_score_table_headers
         )
         self.assertEquals(
-            ['Poor - 0 points', 'Waiting for peer reviews',
-             'Fair - 1 point', 'Waiting for peer reviews'],
+            [u'Poor - 0 points', u'Waiting for peer reviews',
+             u'Fair - 1 point', u'Waiting for peer reviews'],
             self.staff_area_page.learner_final_score_table_values
         )
         self.verify_grade_entries(